X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ft3430-rebase-merges.sh;h=b454f400ebdc22a0c64ee20940f57966ed794709;hb=a08a83db2bf27f015bec9a435f6d73e223c21c5e;hp=a1bc3e20016b37492c4f351970a7d8f8da44d5e8;hpb=0c601052a5f761fd9c207a56ae11789c8598e25d;p=thirdparty%2Fgit.git diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index a1bc3e2001..b454f400eb 100755 --- 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 &&