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>
This commit is contained in:
parent
1d89318c48
commit
f0880f77ab
@ -363,4 +363,21 @@ test_expect_success 'octopus merges' '
|
|||||||
EOF
|
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
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user