rebase -i: fix parsing of "fixup -C<commit>"

[thirdparty/git.git] / t / lib-rebase.sh

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 172d7459ff09b7e619101e2f88e951babea0e9ce..7ca5b918f0445cbb3097e531883861f5574e29a1 100644 (file)
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -4,6 +4,7 @@
 #
 # - override the commit message with $FAKE_COMMIT_MESSAGE
 # - amend the commit message with $FAKE_COMMIT_AMEND
+# - copy the original commit message to a file with $FAKE_MESSAGE_COPY
 # - check that non-commit messages have a certain line count with $EXPECT_COUNT
 # - check the commit count in the commit message header with $EXPECT_HEADER_COUNT
 # - rewrite a rebase -i script as directed by $FAKE_LINES.
@@ -14,10 +15,11 @@
 #       specified line.
 #
 #   "<cmd> <lineno>" -- add a line with the specified command
-#       ("pick", "squash", "fixup", "edit", "reword" or "drop") and the
-#       SHA1 taken from the specified line.
+#       ("pick", "squash", "fixup"|"fixup_-C"|"fixup_-c", "edit", "reword" or "drop")
+#       and the SHA1 taken from the specified line.
 #
-#   "exec_cmd_with_args" -- add an "exec cmd with args" line.
+#   "_" -- add a space, like "fixup_-C" implies "fixup -C" and
+#       "exec_cmd_with_args" add an "exec cmd with args" line.
 #
 #   "#" -- Add a comment line.
 #
@@ -32,6 +34,7 @@ set_fake_editor () {
                        exit
                test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
                test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
+               test -z "$FAKE_MESSAGE_COPY" || cat "$1" >"$FAKE_MESSAGE_COPY"
                exit
                ;;
        esac
@@ -50,12 +53,14 @@ set_fake_editor () {
                        action="$line";;
                exec_*|x_*|break|b)
                        echo "$line" | sed 's/_/ /g' >> "$1";;
+               merge_*|fixup_*)
+                       action=$(echo "$line" | sed 's/_/ /g');;
                "#")
                        echo '# comment' >> "$1";;
                ">")
                        echo >> "$1";;
                bad)
-                       action="badcmd";;
+                       action="pickled";;
                fakesha)
                        test \& != "$action" || action=pick
                        echo "$action XXXXXXX False commit" >> "$1"
@@ -146,3 +151,78 @@ test_editor_unchanged () {
        EOF
        test_cmp expect actual
 }
+
+# Set up an editor for testing reword commands
+# Checks that there are no uncommitted changes when rewording and that the
+# todo-list is reread after each
+set_reword_editor () {
+       >reword-actual &&
+       >reword-oid &&
+
+       # Check rewording keeps the original authorship
+       GIT_AUTHOR_NAME="Reword Author"
+       GIT_AUTHOR_EMAIL="reword.author@example.com"
+       GIT_AUTHOR_DATE=@123456
+
+       write_script reword-sequence-editor.sh <<-\EOF &&
+       todo="$(cat "$1")" &&
+       echo "exec git log -1 --pretty=format:'%an <%ae> %at%n%B%n' \
+               >>reword-actual" >"$1" &&
+       printf "%s\n" "$todo" >>"$1"
+       EOF
+
+       write_script reword-editor.sh <<-EOF &&
+       # Save the oid of the first reworded commit so we can check rebase
+       # fast-forwards to it. Also check that we do not write .git/MERGE_MSG
+       # when fast-forwarding
+       if ! test -s reword-oid
+       then
+               git rev-parse HEAD >reword-oid &&
+               if test -f .git/MERGE_MSG
+               then
+                       echo 1>&2 "error: .git/MERGE_MSG exists"
+                       exit 1
+               fi
+       fi &&
+       # There should be no uncommited changes
+       git diff --exit-code HEAD &&
+       # The todo-list should be re-read after a reword
+       GIT_SEQUENCE_EDITOR="\"$PWD/reword-sequence-editor.sh\"" \
+               git rebase --edit-todo &&
+       echo edited >>"\$1"
+       EOF
+
+       test_set_editor "$PWD/reword-editor.sh"
+}
+
+# Check the results of a rebase after calling set_reword_editor
+# Pass the commits that were reworded in the order that they were picked
+# Expects the first pick to be a fast-forward
+check_reworded_commits () {
+       test_cmp_rev "$(cat reword-oid)" "$1^{commit}" &&
+       git log --format="%an <%ae> %at%n%B%nedited%n" --no-walk=unsorted "$@" \
+               >reword-expected &&
+       test_cmp reword-expected reword-actual &&
+       git log --format="%an <%ae> %at%n%B" -n $# --first-parent --reverse \
+               >reword-log &&
+       test_cmp reword-expected reword-log
+}
+
+# usage: set_replace_editor <file>
+#
+# Replace the todo file with the exact contents of the given file.
+# N.B. sets GIT_SEQUENCE_EDITOR rather than EDITOR so it can be
+# combined with set_fake_editor to reword commits and replace the
+# todo list
+set_replace_editor () {
+       cat >script <<-\EOF &&
+       cat FILENAME >"$1"
+
+       echo 'rebase -i script after editing:'
+       cat "$1"
+       EOF
+
+       sed -e "s/FILENAME/$1/g" script |
+               write_script fake-sequence-editor.sh &&
+       test_set_sequence_editor "$(pwd)/fake-sequence-editor.sh"
+}