Merge branch 'jc/combine-diff-callback'

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 607bf25d8ff7720407c2b15e4808c575b5f36093..212ec54aaf0d805bbdecd93f3311d248a57d5b08 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -11,6 +11,18 @@ test_description='test cherry-pick and revert with conflicts
 
 . ./test-lib.sh
 
+test_cmp_rev () {
+       git rev-parse --verify "$1" >expect.rev &&
+       git rev-parse --verify "$2" >actual.rev &&
+       test_cmp expect.rev actual.rev
+}
+
+pristine_detach () {
+       git checkout -f "$1^0" &&
+       git read-tree -u --reset HEAD &&
+       git clean -d -f -f -q -x
+}
+
 test_expect_success setup '
 
        echo unrelated >unrelated &&
@@ -23,13 +35,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'failed cherry-pick does not advance HEAD' '
-
-       git checkout -f initial^0 &&
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
-
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
+       pristine_detach initial &&
 
        head=$(git rev-parse HEAD) &&
        test_must_fail git cherry-pick picked &&
@@ -39,33 +45,96 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
 '
 
 test_expect_success 'advice from failed cherry-pick' "
-       git checkout -f initial^0 &&
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
-
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
+       pristine_detach initial &&
 
        picked=\$(git rev-parse --short picked) &&
        cat <<-EOF >expected &&
        error: could not apply \$picked... picked
        hint: after resolving the conflicts, mark the corrected paths
        hint: with 'git add <paths>' or 'git rm <paths>'
-       hint: and commit the result with 'git commit -c \$picked'
+       hint: and commit the result with 'git commit'
        EOF
        test_must_fail git cherry-pick picked 2>actual &&
 
-       test_cmp expected actual
+       test_i18ncmp expected actual
 "
 
-test_expect_success 'failed cherry-pick produces dirty index' '
+test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+       test_must_fail git cherry-pick picked &&
+       test_cmp_rev picked CHERRY_PICK_HEAD
+'
 
-       git checkout -f initial^0 &&
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
+test_expect_success 'successful cherry-pick does not set CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+       git cherry-pick base &&
+       test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+'
+
+test_expect_success 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+       git cherry-pick --no-commit base &&
+       test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+'
+
+test_expect_success 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+       (
+               GIT_CHERRY_PICK_HELP="and then do something else" &&
+               export GIT_CHERRY_PICK_HELP &&
+               test_must_fail git cherry-pick picked
+       ) &&
+       test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+'
+
+test_expect_success 'git reset clears CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+
+       test_must_fail git cherry-pick picked &&
+       git reset &&
+
+       test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+'
 
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
+test_expect_success 'failed commit does not clear CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+
+       test_must_fail git cherry-pick picked &&
+       test_must_fail git commit &&
+
+       test_cmp_rev picked CHERRY_PICK_HEAD
+'
+
+test_expect_success 'cancelled commit does not clear CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+
+       test_must_fail git cherry-pick picked &&
+       echo resolved >foo &&
+       git add foo &&
+       git update-index --refresh -q &&
+       test_must_fail git diff-index --exit-code HEAD &&
+       (
+               GIT_EDITOR=false &&
+               export GIT_EDITOR &&
+               test_must_fail git commit
+       ) &&
+
+       test_cmp_rev picked CHERRY_PICK_HEAD
+'
+
+test_expect_success 'successful commit clears CHERRY_PICK_HEAD' '
+       pristine_detach initial &&
+
+       test_must_fail git cherry-pick picked &&
+       echo resolved >foo &&
+       git add foo &&
+       git commit &&
+
+       test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+'
+
+test_expect_success 'failed cherry-pick produces dirty index' '
+       pristine_detach initial &&
 
        test_must_fail git cherry-pick picked &&
 
@@ -74,9 +143,7 @@ test_expect_success 'failed cherry-pick produces dirty index' '
 '
 
 test_expect_success 'failed cherry-pick registers participants in index' '
-
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
+       pristine_detach initial &&
        {
                git checkout base -- foo &&
                git ls-files --stage foo &&
@@ -90,10 +157,7 @@ test_expect_success 'failed cherry-pick registers participants in index' '
                2 s/ 0  / 2     /
                3 s/ 0  / 3     /
        " < stages > expected &&
-       git checkout -f initial^0 &&
-
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
+       git read-tree -u --reset HEAD &&
 
        test_must_fail git cherry-pick picked &&
        git ls-files --stage --unmerged > actual &&
@@ -102,10 +166,7 @@ test_expect_success 'failed cherry-pick registers participants in index' '
 '
 
 test_expect_success 'failed cherry-pick describes conflict in work tree' '
-
-       git checkout -f initial^0 &&
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
+       pristine_detach initial &&
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
@@ -114,9 +175,6 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' '
        >>>>>>> objid picked
        EOF
 
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
-
        test_must_fail git cherry-pick picked &&
 
        sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
@@ -124,11 +182,8 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' '
 '
 
 test_expect_success 'diff3 -m style' '
-
+       pristine_detach initial &&
        git config merge.conflictstyle diff3 &&
-       git checkout -f initial^0 &&
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
@@ -139,9 +194,6 @@ test_expect_success 'diff3 -m style' '
        >>>>>>> objid picked
        EOF
 
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
-
        test_must_fail git cherry-pick picked &&
 
        sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
@@ -149,10 +201,8 @@ test_expect_success 'diff3 -m style' '
 '
 
 test_expect_success 'revert also handles conflicts sanely' '
-
        git config --unset merge.conflictstyle &&
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
+       pristine_detach initial &&
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
@@ -173,10 +223,7 @@ test_expect_success 'revert also handles conflicts sanely' '
                2 s/ 0  / 2     /
                3 s/ 0  / 3     /
        " < stages > expected-stages &&
-       git checkout -f initial^0 &&
-
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
+       git read-tree -u --reset HEAD &&
 
        head=$(git rev-parse HEAD) &&
        test_must_fail git revert picked &&
@@ -192,10 +239,8 @@ test_expect_success 'revert also handles conflicts sanely' '
 '
 
 test_expect_success 'revert conflict, diff3 -m style' '
+       pristine_detach initial &&
        git config merge.conflictstyle diff3 &&
-       git checkout -f initial^0 &&
-       git read-tree -u --reset HEAD &&
-       git clean -d -f -f -q -x &&
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
@@ -206,9 +251,6 @@ test_expect_success 'revert conflict, diff3 -m style' '
        >>>>>>> parent of objid picked
        EOF
 
-       git update-index --refresh &&
-       git diff-index --exit-code HEAD &&
-
        test_must_fail git revert picked &&
 
        sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&