Re: git-status producing incorrect results
- From
Jeff King <peff@peff.net>
- Date
- Feb 14, 2008, 17:18 UTC
- Message-ID
- <20080214171823.GA28762@coredump.intra.peff.net>
- In-Reply-To
- <alpine.LFD.1.00.0802140902470.6110@woody.linux-foundation.org>
On Thu, Feb 14, 2008 at 09:04:59AM -0800, Linus Torvalds wrote:
> ACK again, that's almost certainly the right long-term fix, but it > essentially requires a "copy_index()" thing that creates a new index from > an existing copy (so that we don't need to re-read it) etc infrastructure > changes, so I think your patch is the correct one for now.
Here is the cleaned-up mini-fix for now, then.
-- >8 -- commit: discard index after setting up partial commit
There may still be some entries from the original index that should be discarded before we show the status. In particular, if a file was added in the index but not included in the partial commit, it would still show up in the status listing as staged for commit.
Ultimately the correct fix is to keep the two states in separate index_state variables. Then we can avoid having to reload the cache from the temporary file altogether, and just point wt_status_print at the correct index.
Signed-off-by: Jeff King <peff@peff.net> --- builtin-commit.c | 4 ++++ t/t7502-status.sh | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c index 0442c8e..6612b4f 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -317,6 +317,10 @@ static char *prepare_index(int argc, const char **argv, const char *prefix) if (write_cache(fd, active_cache, active_nr) || close_lock_file(&false_lock)) die("unable to write temporary index file"); + + discard_cache(); + read_cache_from(false_lock.filename); + return false_lock.filename; } diff --git a/t/t7502-status.sh b/t/t7502-status.sh index b64ce30..e006074 100755 --- a/t/t7502-status.sh +++ b/t/t7502-status.sh @@ -128,4 +128,25 @@ test_expect_success 'status without relative paths' ' ' +cat <<EOF >expect +# On branch master +# Changes to be committed: +# (use "git reset HEAD <file>..." to unstage) +# +# modified: dir1/modified +# +# Untracked files: +# (use "git add <file>..." to include in what will be committed) +# +# dir1/untracked +# dir2/ +# expect +# output +# untracked +EOF +test_expect_success 'status of partial commit excluding new file in index' ' + git status dir1/modified >output && + diff -u expect output +' + test_done
-- 1.5.4.1.1324.gfec5c