Re: [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged

2014-08-13 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: 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

Re: [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged

2014-08-13 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: 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'

Re: [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged

2014-08-13 Thread Johannes Sixt
Am 13.08.2014 20:59, schrieb Junio C Hamano: diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 0c9ec0a..cedbb6a 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -223,6 +223,23 @@ test_expect_success 'checkout --merge --conflict=diff3 branch' ' test_cmp two expect '

Re: [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged

2014-08-13 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: Am 13.08.2014 20:59, schrieb Junio C Hamano: diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 0c9ec0a..cedbb6a 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -223,6 +223,23 @@ test_expect_success 'checkout --merge --conflict=diff3 branch' '

[PATCH 3/3] checkout -m: attempt merge when deletion of path was staged

2014-08-12 Thread Jonathan Nieder
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,

Re: [PATCH 3/3] checkout -m: attempt merge when deletion of path was staged

2014-08-12 Thread Junio C Hamano
On Tue, Aug 12, 2014 at 5:03 PM, Jonathan Nieder jrnie...@gmail.com wrote: 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