| commit | d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Oct 2008 23:00:06 +0000 (15 16:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Oct 2008 17:00:59 +0000 (18 10:00 -0700) | ||
| tree | c248f1a5ea841d2ac72cfb6aa46b2370ce9b8460 | treesnapshot (tar.gz zip) |
| parent | c82efafcfa741cdddbc68379c1905953f58ef21d | commitdiff |
reset --hard/read-tree --reset -u: remove unmerged new paths
When aborting a failed merge that has brought in a new path using "git
reset --hard" or "git read-tree --reset -u", we used to first forget about
the new path (via read_cache_unmerged) and then matched the working tree
to what is recorded in the index, thus ending up leaving the new path in
the work tree.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When aborting a failed merge that has brought in a new path using "git
reset --hard" or "git read-tree --reset -u", we used to first forget about
the new path (via read_cache_unmerged) and then matched the working tree
to what is recorded in the index, thus ending up leaving the new path in
the work tree.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| read-cache.c | diffblobblamehistory | |
| t/t1005-read-tree-reset.sh | diffblobblamehistory |