Skip to content

Commit bafa2d7

Browse files
chris3torekgitster
authored andcommitted
t/t3430: avoid undefined git diff behavior
The autosquash-and-exec test used "git diff HEAD^!" to mean "git diff HEAD^ HEAD". Use these directly instead of relying on the undefined but actual-current behavior of "HEAD^!". Signed-off-by: Chris Torek <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent af6b65d commit bafa2d7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t3430-rebase-merges.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ test_expect_success 'with --autosquash and --exec' '
420420
git commit --fixup B B.t &&
421421
write_script show.sh <<-\EOF &&
422422
subject="$(git show -s --format=%s HEAD)"
423-
content="$(git diff HEAD^! | tail -n 1)"
423+
content="$(git diff HEAD^ HEAD | tail -n 1)"
424424
echo "$subject: $content"
425425
EOF
426426
test_tick &&

0 commit comments

Comments
 (0)