diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:48 -0700 |
| commit | 750eb11d8f53feba4a797c1be1a0ad2f68f88879 (patch) | |
| tree | e8db3ea760c3abe42d58436547547b80c4fb1238 /t | |
| parent | Merge branch 'ab/test-must-be-empty-for-master' (diff) | |
| parent | rebase --exec: make it work with --rebase-merges (diff) | |
| download | tgif-750eb11d8f53feba4a797c1be1a0ad2f68f88879.tar.xz | |
Merge branch 'js/rebase-merges-exec-fix'
The "--exec" option to "git rebase --rebase-merges" placed the exec
commands at wrong places, which has been corrected.
* js/rebase-merges-exec-fix:
rebase --exec: make it work with --rebase-merges
t3430: demonstrate what -r, --autosquash & --exec should do
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 9e62297274..90ae613e23 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -363,4 +363,21 @@ test_expect_success 'octopus merges' ' EOF ' +test_expect_success '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 |