author | Jeff King <peff@peff.net> | |
Thu, 14 Feb 2008 17:18:23 +0000 (12:18 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 16 Feb 2008 08:12:56 +0000 (00:12 -0800) | ||
commit | 959ba670ad7173bcb73afaca69625a5635f63b8b | |
tree | 655b222daa13108dd01cfce5f444282f7e2f3c8c | tree | snapshot |
parent | 1fe32cb9d0807e6da468dc7bf96d427b2f38c1c4 | commit | diff |
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-commit.c | diff | blob | history | |
t/t7502-status.sh | diff | blob | history |