diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 02:59:40 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 02:59:40 +0300 |
commit | a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2 (patch) | |
tree | 90ef8cc9887affd5aee3c1514fb39db845642b31 | |
parent | 42aac96763a72b5bac73d34640d3a0c6233027a6 (diff) | |
parent | 6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 (diff) |
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts
Conflicts:
t/t7201-co.sh
-rw-r--r-- | builtin-checkout.c | 2 | ||||
-rwxr-xr-x | t/t7201-co.sh | 57 |
2 files changed, 58 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 793542eb06..e44e238c39 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -167,7 +167,7 @@ static int checkout_merged(int pos, struct checkout *state) fill_mm(active_cache[pos+2]->sha1, &theirs); status = ll_merge(&result_buf, path, &ancestor, - &ours, "ours", &theirs, "theirs", 1); + &ours, "ours", &theirs, "theirs", 0); free(ancestor.ptr); free(ours.ptr); free(theirs.ptr); diff --git a/t/t7201-co.sh b/t/t7201-co.sh index ebfd34df36..6442f710be 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -542,4 +542,61 @@ test_expect_success 'switch out of non-branch' ' ! grep "^Previous HEAD" error.log ' +( + echo "#!$SHELL_PATH" + cat <<\EOF +O=$1 A=$2 B=$3 +cat "$A" >.tmp +exec >"$A" +echo '<<<<<<< filfre-theirs' +cat "$B" +echo '||||||| filfre-common' +cat "$O" +echo '=======' +cat ".tmp" +echo '>>>>>>> filfre-ours' +rm -f .tmp +exit 1 +EOF +) >filfre.sh +chmod +x filfre.sh + +test_expect_success 'custom merge driver with checkout -m' ' + git reset --hard && + + git config merge.filfre.driver "./filfre.sh %O %A %B" && + git config merge.filfre.name "Feel-free merge driver" && + git config merge.filfre.recursive binary && + echo "arm merge=filfre" >.gitattributes && + + git checkout -b left && + echo neutral >arm && + git add arm .gitattributes && + test_tick && + git commit -m neutral && + git branch right && + + echo left >arm && + test_tick && + git commit -a -m left && + git checkout right && + + echo right >arm && + test_tick && + git commit -a -m right && + + test_must_fail git merge left && + ( + for t in filfre-common left right + do + grep $t arm || exit 1 + done + exit 0 + ) && + + mv arm expect && + git checkout -m arm && + test_cmp expect arm +' + test_done |