diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:14 +0900 |
| commit | 396a167bd4e68f496981345c3d89459abb910b7e (patch) | |
| tree | ecb9516c0a1054328aae54debc1cf03eeddef605 /t | |
| parent | Merge branch 'js/ci-coverity' into maint-2.42 (diff) | |
| parent | rebase: allow overriding the maximal length of the generated labels (diff) | |
| download | git-396a167bd4e68f496981345c3d89459abb910b7e.tar.gz git-396a167bd4e68f496981345c3d89459abb910b7e.zip | |
Merge branch 'mp/rebase-label-length-limit' into maint-2.42
Overly long label names used in the sequencer machinery are now
chopped to fit under filesystem limitation.
* mp/rebase-label-length-limit:
rebase: allow overriding the maximal length of the generated labels
sequencer: truncate labels to accommodate loose refs
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 96ae0edf1e..ac5c390652 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -586,4 +586,15 @@ test_expect_success 'progress shows the correct total' ' test_line_count = 14 progress ' +test_expect_success 'truncate label names' ' + commit=$(git commit-tree -p HEAD^ -p HEAD -m "0123456789 我 123" HEAD^{tree}) && + git merge --ff-only $commit && + + done="$(git rev-parse --git-path rebase-merge/done)" && + git -c rebase.maxLabelLength=14 rebase --rebase-merges -x "cp \"$done\" out" --root && + grep "label 0123456789-我$" out && + git -c rebase.maxLabelLength=13 rebase --rebase-merges -x "cp \"$done\" out" --root && + grep "label 0123456789-$" out +' + test_done |