Browse Source

t3430: demonstrate what -r, --autosquash & --exec should do

The --exec option's implementation is not really well-prepared for
--rebase-merges. Demonstrate this.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 7 years ago committed by Junio C Hamano
parent
commit
f0880f77ab
  1. 17
      t/t3430-rebase-merges.sh

17
t/t3430-rebase-merges.sh

@ -363,4 +363,21 @@ test_expect_success 'octopus merges' ' @@ -363,4 +363,21 @@ test_expect_success 'octopus merges' '
EOF
'

test_expect_failure 'with --autosquash and --exec' '
git checkout -b with-exec H &&
echo Booh >B.t &&
test_tick &&
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)"
echo "$subject: $content"
EOF
test_tick &&
git rebase -ir --autosquash --exec ./show.sh A >actual &&
grep "B: +Booh" actual &&
grep "E: +Booh" actual &&
grep "G: +G" actual
'

test_done

Loading…
Cancel
Save