Merge branch 'jc/allow-ff-merging-kept-tags'

diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index b13f72975ecce17887c4c8275c6935d78d4b09a0..1f43b3cd4cd34ec6f4c3de4cfe8a26291e4e480f 100755 (executable)
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -4,6 +4,38 @@ test_description='prepare-commit-msg hook'
 
 . ./test-lib.sh
 
+test_expect_success 'set up commits for rebasing' '
+       test_commit root &&
+       test_commit a a a &&
+       test_commit b b b &&
+       git checkout -b rebase-me root &&
+       test_commit rebase-a a aa &&
+       test_commit rebase-b b bb &&
+       for i in $(test_seq 1 13)
+       do
+               test_commit rebase-$i c $i
+       done &&
+       git checkout master &&
+
+       cat >rebase-todo <<-EOF
+       pick $(git rev-parse rebase-a)
+       pick $(git rev-parse rebase-b)
+       fixup $(git rev-parse rebase-1)
+       fixup $(git rev-parse rebase-2)
+       pick $(git rev-parse rebase-3)
+       fixup $(git rev-parse rebase-4)
+       squash $(git rev-parse rebase-5)
+       reword $(git rev-parse rebase-6)
+       squash $(git rev-parse rebase-7)
+       fixup $(git rev-parse rebase-8)
+       fixup $(git rev-parse rebase-9)
+       edit $(git rev-parse rebase-10)
+       squash $(git rev-parse rebase-11)
+       squash $(git rev-parse rebase-12)
+       edit $(git rev-parse rebase-13)
+       EOF
+'
+
 test_expect_success 'with no hook' '
 
        echo "foo" > file &&
@@ -31,17 +63,41 @@ mkdir -p "$HOOKDIR"
 echo "#!$SHELL_PATH" > "$HOOK"
 cat >> "$HOOK" <<'EOF'
 
-if test "$2" = commit; then
-  source=$(git rev-parse "$3")
+GIT_DIR=$(git rev-parse --git-dir)
+if test -d "$GIT_DIR/rebase-merge"
+then
+       rebasing=1
 else
-  source=${2-default}
+       rebasing=0
 fi
-if test "$GIT_EDITOR" = :; then
-  sed -e "1s/.*/$source (no editor)/" "$1" > msg.tmp
+
+get_last_cmd () {
+       tail -n1 "$GIT_DIR/rebase-merge/done" | {
+               read cmd id _
+               git log --pretty="[$cmd %s]" -n1 $id
+       }
+}
+
+if test "$2" = commit
+then
+       if test $rebasing = 1
+       then
+               source="$3"
+       else
+               source=$(git rev-parse "$3")
+       fi
 else
-  sed -e "1s/.*/$source/" "$1" > msg.tmp
+       source=${2-default}
+fi
+test "$GIT_EDITOR" = : && source="$source (no editor)"
+
+if test $rebasing = 1
+then
+       echo "$source $(get_last_cmd)" >"$1"
+else
+       sed -e "1s/.*/$source/" "$1" >msg.tmp
+       mv msg.tmp "$1"
 fi
-mv msg.tmp "$1"
 exit 0
 EOF
 chmod +x "$HOOK"
@@ -156,6 +212,63 @@ test_expect_success 'with hook and editor (merge)' '
        test "$(git log -1 --pretty=format:%s)" = "merge"
 '
 
+test_rebase () {
+       expect=$1 &&
+       mode=$2 &&
+       test_expect_$expect C_LOCALE_OUTPUT "with hook (rebase $mode)" '
+               test_when_finished "\
+                       git rebase --abort
+                       git checkout -f master
+                       git branch -D tmp" &&
+               git checkout -b tmp rebase-me &&
+               GIT_SEQUENCE_EDITOR="cp rebase-todo" &&
+               GIT_EDITOR="\"$FAKE_EDITOR\"" &&
+               (
+                       export GIT_SEQUENCE_EDITOR GIT_EDITOR &&
+                       test_must_fail git rebase $mode b &&
+                       echo x >a &&
+                       git add a &&
+                       test_must_fail git rebase --continue &&
+                       echo x >b &&
+                       git add b &&
+                       git commit &&
+                       git rebase --continue &&
+                       echo y >a &&
+                       git add a &&
+                       git commit &&
+                       git rebase --continue &&
+                       echo y >b &&
+                       git add b &&
+                       git rebase --continue
+               ) &&
+               if test $mode = -p # reword amended after pick
+               then
+                       n=18
+               else
+                       n=17
+               fi &&
+               git log --pretty=%s -g -n$n HEAD@{1} >actual &&
+               test_cmp "$TEST_DIRECTORY/t7505/expected-rebase$mode" actual
+       '
+}
+
+test_rebase success -i
+test_rebase success -p
+
+test_expect_success 'with hook (cherry-pick)' '
+       test_when_finished "git checkout -f master" &&
+       git checkout -B other b &&
+       git cherry-pick rebase-1 &&
+       test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
+'
+
+test_expect_success 'with hook and editor (cherry-pick)' '
+       test_when_finished "git checkout -f master" &&
+       git checkout -B other b &&
+       git cherry-pick -e rebase-1 &&
+       test "$(git log -1 --pretty=format:%s)" = merge
+'
+
 cat > "$HOOK" <<'EOF'
 #!/bin/sh
 exit 1
@@ -197,4 +310,11 @@ test_expect_success 'with failing hook (merge)' '
 
 '
 
+test_expect_success C_LOCALE_OUTPUT 'with failing hook (cherry-pick)' '
+       test_when_finished "git checkout -f master" &&
+       git checkout -B other b &&
+       test_must_fail git cherry-pick rebase-1 2>actual &&
+       test $(grep -c prepare-commit-msg actual) = 1
+'
+
 test_done