mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/status-optionally-refresh'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-05-08 22:35:39 -07:00
parent c58c5129d6 b2f6fd9575
commit e251a7b34a
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/commit.c
View File

@ -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);