Commit 4bb6644d authored by Markus Heidelberg's avatar Markus Heidelberg Committed by Junio C Hamano

git status: refresh the index if possible

This was already the case before commit 9e4b7ab6 (git status: not
"commit --dry-run" anymore, 2009-08-15) with the difference that it died
at failure.
It got lost during the new implementation of "git status", which was
meant to only change behaviour when invoked with arguments.
Signed-off-by: Markus Heidelberg's avatarMarkus Heidelberg <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 4c926b37
......@@ -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[] = {
......@@ -1050,6 +1051,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) {
if (!write_cache(fd, active_cache, active_nr))
s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
s.in_merge = in_merge;
......@@ -499,7 +499,7 @@ test_expect_success 'dry-run of partial commit excluding new file in index' '
cat >expect <<EOF
:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M dir1/modified
test_expect_failure 'status refreshes the index' '
test_expect_success 'status refreshes the index' '
touch dir2/added &&
git status &&
git diff-files >output &&
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment