| commit | 4cc8d6c62db1f82b3c98468806d2ee54c7e037ca | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Jan 2009 22:24:53 +0000 (28 14:24 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Jan 2009 01:29:33 +0000 (28 17:29 -0800) | ||
| tree | 8c829e1c28c2c8113cfd349c3f3687fcf7cf2b1b | treesnapshot (tar.gz zip) |
| parent | 02322e1619dc537dc48650761f6c9bae883612a7 | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t2200-add-update.sh | diffblobblamehistory |