Re: [PATCH 4/4] git status: refresh the index
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:32
Markus Heidelberg [off-list ref] writes:
quoted hunk
This was already the case before commit 9e4b7ab6 (git status: not "commit --dry-run" anymore, 2009-08-15) and got lost during the conversion, which was meant to only change behaviour when invoked with arguments. Signed-off-by: Markus Heidelberg <redacted> --- builtin/commit.c | 5 +++++ t/t7508-status.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)diff --git a/builtin/commit.c b/builtin/commit.c index c5ab683..2262734 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,10 @@ 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, 1); + if (write_cache(fd, active_cache, active_nr) || + commit_locked_index(&index_lock)) + die("unable to write new_index file");
This is a regression, I think. The first two patches are trivially correct and I'll queue them to 'master'. Thanks.