mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: fix parsing of "fixup -C<commit>"

Browse Source 
If the user omits the space between "-C" and the commit in a fixup
command then it is parsed as an ordinary fixup and the commit message is
not updated as it should be. Fix this by making the space between "-C"
and "<commit>" optional as it is for the "merge" command.

Note that set_replace_editor() is changed to set $GIT_SEQUENCE_EDITOR
instead of $EDITOR in order to be able to replace the todo list and
reword commits with $FAKE_COMMIT_MESSAGE. This is safe as all the
existing users are using set_replace_editor() to replace the todo list.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood
2023-02-23 20:55:01 +00:00
committed by Junio C Hamano
parent 7aed2c0565
commit 666b6e1135
4 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/test-lib-functions.sh
View File

@ -32,6 +32,14 @@ test_set_editor () {
export EDITOR
}
# Like test_set_editor but sets GIT_SEQUENCE_EDITOR instead of EDITOR
test_set_sequence_editor () {
FAKE_SEQUENCE_EDITOR="$1"
export FAKE_SEQUENCE_EDITOR
GIT_SEQUENCE_EDITOR='"$FAKE_SEQUENCE_EDITOR"'
export GIT_SEQUENCE_EDITOR
}
test_decode_color () {
awk '
function name(n) {