diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2015-03-08 17:12:41 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-12 13:45:17 -0700 |
| commit | 226c051adb0f64772f807287e130a6a546b95fbd (patch) | |
| tree | 01e1240cc33b4bb915d9aed9c3ef57fea32da44a | |
| parent | 76e6b090a0b9b1e83b8e467d1b64f250f66c3f54 (diff) | |
| download | git-226c051adb0f64772f807287e130a6a546b95fbd.tar.gz | |
status: enable untracked cache
update_index_if_able() is moved down so that the updated untracked
cache could be written out.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/commit.c | 5 | ||||
| -rw-r--r-- | wt-status.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 961e467242..fe380a9b92 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1364,13 +1364,14 @@ int cmd_status(int argc, const char **argv, const char *prefix) refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL); fd = hold_locked_index(&index_lock, 0); - if (0 <= fd) - update_index_if_able(&the_index, &index_lock); s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0; s.ignore_submodule_arg = ignore_submodule_arg; wt_status_collect(&s); + if (0 <= fd) + update_index_if_able(&the_index, &index_lock); + if (s.relative_paths) s.prefix = prefix; diff --git a/wt-status.c b/wt-status.c index 29666d0dba..fc1b82e2c1 100644 --- a/wt-status.c +++ b/wt-status.c @@ -585,6 +585,8 @@ static void wt_status_collect_untracked(struct wt_status *s) DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; if (s->show_ignored_files) dir.flags |= DIR_SHOW_IGNORED_TOO; + else + dir.untracked = the_index.untracked; setup_standard_excludes(&dir); fill_directory(&dir, &s->pathspec); |