undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3432: test --merge' with rebase.abbreviateCommands = true', too

Browse Source 
When fast forwarding, `git --merge' should act the same whether
`rebase.abbreviateCommands' is set or not, but so far it was not the
case.  This duplicates the tests ensuring that `--merge' works when fast
forwarding to check if it also works with abbreviated commands.

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alban Gruin 2020-03-30 14:42:36 +02:00 committed by Junio C Hamano
parent 68e7090f31
commit de9f1d3ef4
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
t/t3432-rebase-fast-forward.sh
View File

@ -28,10 +28,12 @@ test_rebase_same_head () {
shift && shift &&
cmp_f="$1" && cmp_f="$1" &&
shift && shift &&
test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" && test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" &&
test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*" test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*"
test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" &&
test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*"
test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" &&
test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*"
} }
test_rebase_same_head_ () { test_rebase_same_head_ () {
@ -41,9 +43,21 @@ test_rebase_same_head_ () {
shift && shift &&
cmp="$1" && cmp="$1" &&
shift && shift &&
abbreviate="$1" &&
shift &&
flag="$1" flag="$1"
shift && shift &&
test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" " if test $abbreviate -eq 1
then
msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD"
else
msg="git rebase$flag $* with $changes is $what with $cmp HEAD"
fi &&
test_expect_$status "$msg" "
if test $abbreviate -eq 1
then
test_config rebase.abbreviateCommands true
fi &&
oldhead=\$(git rev-parse HEAD) && oldhead=\$(git rev-parse HEAD) &&
test_when_finished 'git reset --hard \$oldhead' && test_when_finished 'git reset --hard \$oldhead' &&
cp .git/logs/HEAD expect && cp .git/logs/HEAD expect &&