git/list[1] front-page[2] threads[3] people[4] search[5] about
 

bad behaviour while using git rebase -i -p

From
JVJan Viktorin <viktorin@rehivetech.com>
Date
Feb 9, 2018, 00:39 UTC
Message-ID
<20180209013902.6702a0dd@jvn>
Hello,

since Git 2.16.1, I've noticed a bad behaviour of git rebase -i -p. It screws up merge commits created with --log (or config merge.log = true) in my history. A good merge commit with message like:

    Merge branch 'test'
    
    * test:
      c
      b
is changed after rebase (without touching that commit in any way) into:
    Merge branch 'test' a git-rebase-p-test.sh test: c b

It seems, like the commit message is interpreted somehow - the '*' character is expanded to the list of files in the current directory and the original spacing is removed. This happens during my regular work.

Here is a code that seems to be reproducing this behaviour well:
git init

touch a git add a git commit -m a

git checkout -b test # a new branch made to merge back to master later

touch b git add b git commit -m b

touch c git add c git commit -m c

git checkout master git merge --no-edit --log test git log -1 # everything looks good at this point

export GIT_SEQUENCE_EDITOR='sed "1s/pick/reword/" -i' # we are rewording only the first commit... export EDITOR='sed "s/b/x/" -i' # ...and changing its message from "b" to "x"

git rebase -i HEAD^1 -p git log -1 # here, you can see the bad merge commit message

Regards Jan

Next: Junio C Hamano
Message 1 of 2 in “bad behaviour while using git rebase -i -p”
  1. Jan ViktorinFeb 9, 2018
  2. Junio C HamanoFeb 9, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.