| commit | 2f682e21a6dc3b7403fd0162252183fdef019274 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 19 Apr 2018 17:58:18 +0000 (19 10:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 May 2018 07:11:00 +0000 (8 16:11 +0900) | ||
| tree | 7786c764e8bc53641337149f91818f5b919c5595 | treesnapshot (tar.gz zip) |
| parent | bd42380ef1ec773d1557b28ba6924f4020333143 | commitdiff |
merge-recursive: avoid triggering add_cacheinfo error with dirty mod
If a cherry-pick or merge with a rename results in a skippable update
(due to the merged content matching what HEAD already had), but the
working directory is dirty, avoid trying to refresh the index as that
will fail.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If a cherry-pick or merge with a rename results in a skippable update
(due to the merged content matching what HEAD already had), but the
working directory is dirty, avoid trying to refresh the index as that
will fail.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory | |
| t/t3501-revert-cherry-pick.sh | diffblobblamehistory |