]> git.ipfire.org Git - thirdparty/git.git/commit
sequencer: comment checked-out branch properly
authorKristoffer Haugsbakk <code@khaugsbakk.name>
Mon, 25 Nov 2024 20:13:11 +0000 (21:13 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Nov 2024 01:05:08 +0000 (10:05 +0900)
commit94304b9f48e9c68f3214e25527c3aac865d3ce63
tree4c960e79befed3096e33a70327a38c672bf1d924
parentfd3785337beb285ed7fd67ce6fc3d3bed2097b40
sequencer: comment checked-out branch properly

`git rebase --update-ref` does not insert commands for dependent/sub-
branches which are checked out.[1]  Instead it leaves a comment about
that fact.  The comment char is hardcoded (#).  In turn the comment
line gets interpreted as an invalid command when `core.commentChar`/
`core.commentString` is in use.

† 1: See 900b50c242 (rebase: add --update-refs option, 2022-07-19)

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
t/t3400-rebase.sh