| From 248f9225b2f2deaea6d01fa803f49473e05dd371 Mon Sep 17 00:00:00 2001 |
| From: Alban Gruin <alban.gruin@gmail.com> |
| Date: Mon, 30 Mar 2020 14:42:36 +0200 |
| Subject: t3432: test `--merge' with `rebase.abbreviateCommands = true', too |
| |
| commit de9f1d3ef45ec885339d04f9e34293eb2de8605d upstream. |
| |
| 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> |
| Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
| --- |
| t/t3432-rebase-fast-forward.sh | 24 +++++++++++++++++++----- |
| 1 file changed, 19 insertions(+), 5 deletions(-) |
| |
| diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh |
| index 6c9d4a13758..6f0452c0eac 100755 |
| --- a/t/t3432-rebase-fast-forward.sh |
| +++ b/t/t3432-rebase-fast-forward.sh |
| @@ -28,10 +28,12 @@ test_rebase_same_head () { |
| shift && |
| cmp_f="$1" && |
| shift && |
| - test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" && |
| - test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*" |
| - test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && |
| - test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" |
| + test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" && |
| + test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*" |
| + test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" && |
| + 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_ () { |
| @@ -41,9 +43,21 @@ test_rebase_same_head_ () { |
| shift && |
| cmp="$1" && |
| shift && |
| + abbreviate="$1" && |
| + shift && |
| flag="$1" |
| 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) && |
| test_when_finished 'git reset --hard \$oldhead' && |
| cp .git/logs/HEAD expect && |
| -- |
| 2.26.0.110.g2183baf09c |
| |
