diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:35:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:35:39 -0700 |
| commit | e251a7b34a85b0ac8a63a31e899e070ea2a330c7 (patch) | |
| tree | 1fbb516e74dd4ae687e7423d85aed23cf58f7d6c /builtin | |
| parent | Merge branch 'cw/ws-indent-with-tab' (diff) | |
| parent | t7508: add a test for "git status" in a read-only repository (diff) | |
| download | tgif-e251a7b34a85b0ac8a63a31e899e070ea2a330c7.tar.xz | |
Merge branch 'mh/status-optionally-refresh'
* mh/status-optionally-refresh:
t7508: add a test for "git status" in a read-only repository
git status: refresh the index if possible
t7508: add test for "git status" refreshing the index
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index c5ab683d5b..3c14ade9dd 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1017,6 +1017,7 @@ static int git_status_config(const char *k, const char *v, void *cb) int cmd_status(int argc, const char **argv, const char *prefix) { struct wt_status s; + int fd; unsigned char sha1[20]; static struct option builtin_status_options[] = { OPT__VERBOSE(&verbose), @@ -1050,6 +1051,14 @@ int cmd_status(int argc, const char **argv, const char *prefix) read_cache_preload(s.pathspec); refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL); + + fd = hold_locked_index(&index_lock, 0); + if (0 <= fd) { + if (!write_cache(fd, active_cache, active_nr)) + commit_locked_index(&index_lock); + rollback_lock_file(&index_lock); + } + s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0; s.in_merge = in_merge; wt_status_collect(&s); |