diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:43 (GMT) |
| commit | 917d0d6234be4c6ce4ab0feea15911bfa5e65253 (patch) | |
| tree | dad840743cf4009490fbf274687eabe27bb6ece8 /t | |
| parent | 56d3ce82b0e2c29ce9e14ed95923ea7d0f41ae54 (diff) | |
| parent | cd5522271f6b985114b33332e148bff2283b0440 (diff) | |
| download | git-917d0d6234be4c6ce4ab0feea15911bfa5e65253.zip git-917d0d6234be4c6ce4ab0feea15911bfa5e65253.tar.gz git-917d0d6234be4c6ce4ab0feea15911bfa5e65253.tar.bz2 | |
Merge branch 'js/rebase-r-safer-label'
A label used in the todo list that are generated by "git rebase
--rebase-merges" is used as a part of a refname; the logic to come
up with the label has been tightened to avoid names that cannot be
used as such.
* js/rebase-r-safer-label:
rebase -r: let `label` generate safer labels
rebase-merges: move labels' whitespace mangling into `label_oid()`
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index a30d27e..bd70145 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -468,4 +468,10 @@ test_expect_success '--rebase-merges with strategies' ' test_cmp expect G.t ' +test_expect_success '--rebase-merges with commit that can generate bad characters for filename' ' + git checkout -b colon-in-label E && + git merge -m "colon: this should work" G && + git rebase --rebase-merges --force-rebase E +' + test_done |