]> git.ipfire.org Git - thirdparty/git.git/commit - read-cache.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c82efaf) | patch
reset --hard/read-tree --reset -u: remove unmerged new paths
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2008 23:00:06 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Oct 2008 17:00:59 +0000 (10:00 -0700)
commitd1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65
treec248f1a5ea841d2ac72cfb6aa46b2370ce9b8460tree | snapshot
parentc82efafcfa741cdddbc68379c1905953f58ef21dcommit | diff
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>
read-cache.c diff | blob | blame | history
t/t1005-read-tree-reset.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.