* bad behaviour while using git rebase -i -p
@ 2018-02-09 0:39 Jan Viktorin
2018-02-09 2:32 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Jan Viktorin @ 2018-02-09 0:39 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: bad behaviour while using git rebase -i -p
2018-02-09 0:39 bad behaviour while using git rebase -i -p Jan Viktorin
@ 2018-02-09 2:32 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2018-02-09 2:32 UTC (permalink / raw)
To: Jan Viktorin; +Cc: git, Gregory Herrero
Jan Viktorin <viktorin@rehivetech.com> writes:
> 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
I think we saw this problem independently discovered and a fix for
it posted today to the list.
https://public-inbox.org/git/20180208204241.19324-1-gregory.herrero@oracle.com/
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-09 2:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-09 0:39 bad behaviour while using git rebase -i -p Jan Viktorin
2018-02-09 2:32 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).