diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-05 12:52:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 12:52:43 -0800 |
| commit | 995b1b1411e5ad45d100354f4a6c185fef79cbf6 (patch) | |
| tree | 4a4305faaa93c1fca895a18380d61f532850f557 /t | |
| parent | Merge branch 'js/builtin-add-i' (diff) | |
| parent | sequencer: handle rebase-merges for "onto" message (diff) | |
| download | tgif-995b1b1411e5ad45d100354f4a6c185fef79cbf6.tar.xz | |
Merge branch 'dd/rebase-merge-reserves-onto-label'
The logic to avoid duplicate label names generated by "git rebase
--rebase-merges" forgot that the machinery itself uses "onto" as a
label name, which must be avoided by auto-generated labels, which
has been corrected.
* dd/rebase-merge-reserves-onto-label:
sequencer: handle rebase-merges for "onto" message
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index bd701458ea..7ab0152d3e 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -474,4 +474,25 @@ test_expect_success '--rebase-merges with commit that can generate bad character git rebase --rebase-merges --force-rebase E ' +test_expect_success '--rebase-merges with message matched with onto label' ' + git checkout -b onto-label E && + git merge -m onto G && + git rebase --rebase-merges --force-rebase E && + test_cmp_graph <<-\EOF + * onto + |\ + | * G + | * F + * | E + |\ \ + | * | B + * | | D + | |/ + |/| + * | C + |/ + * A + EOF +' + test_done |