]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 02322e1) | patch
add -u: do not fail to resolve a path as deleted
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Jan 2009 22:24:53 +0000 (14:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Jan 2009 01:29:33 +0000 (17:29 -0800)
commit4cc8d6c62db1f82b3c98468806d2ee54c7e037ca
tree8c829e1c28c2c8113cfd349c3f3687fcf7cf2b1btree | snapshot
parent02322e1619dc537dc48650761f6c9bae883612a7commit | diff
add -u: do not fail to resolve a path as deleted

After you resolve a conflicted merge to remove the path, "git add -u"
failed to record the removal.  Instead it errored out by saying that the
removed path is not found in the work tree, but that is what the user
already knows, and the wanted to record the removal as the resolution,
so the error does not make sense.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
read-cache.c diff | blob | history
t/t2200-add-update.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.