diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2014-08-12 17:03:18 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-08-25 15:17:34 -0700 |
| commit | 6a143aa2b23b97fa8363e2f4fd16f23b4c5b104d (patch) | |
| tree | 6b8755ddc6c9210f39a5f477c41d859e9114d3c5 /Documentation/git-grep.txt | |
| parent | unpack-trees: use 'cuddled' style for if-else cascade (diff) | |
| download | tgif-6a143aa2b23b97fa8363e2f4fd16f23b4c5b104d.tar.xz | |
checkout -m: attempt merge when deletion of path was staged
twoway_merge() is missing an o->gently check in the case where a file
that needs to be modified is missing from the index but present in the
old and new trees. As a result, in this case 'git checkout -m' errors
out instead of trying to perform a merge.
Fix it by checking o->gently. While at it, inline the o->gently check
into reject_merge to prevent future call sites from making the same
mistake.
Noticed by code inspection. The test for the motivating case was
added by JC.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-grep.txt')
0 files changed, 0 insertions, 0 deletions