The sixth batch

[thirdparty/git.git] / t / t3430-rebase-merges.sh

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index a1bc3e20016b37492c4f351970a7d8f8da44d5e8..b454f400ebdc22a0c64ee20940f57966ed794709 100755 (executable)
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -420,7 +420,7 @@ test_expect_success 'with --autosquash and --exec' '
        git commit --fixup B B.t &&
        write_script show.sh <<-\EOF &&
        subject="$(git show -s --format=%s HEAD)"
-       content="$(git diff HEAD^! | tail -n 1)"
+       content="$(git diff HEAD^ HEAD | tail -n 1)"
        echo "$subject: $content"
        EOF
        test_tick &&