Code

rebase -m: Fix incorrect short-logs of already applied commits.
authorJohannes Sixt <johannes.sixt@telecom.at>
Sat, 1 Sep 2007 07:25:27 +0000 (09:25 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Sep 2007 09:23:05 +0000 (02:23 -0700)
commit7afa845edc09d2818af5fe67a0eb45ec579d1260
tree6e132b3f4b3d33a5216ea86c3b1c67607de898a9
parentaecbf914c43ab76e055fa8a25b12456ae74d91bc
rebase -m: Fix incorrect short-logs of already applied commits.

When a topic branch is rebased, some of whose commits are already
cherry-picked upstream:

    o--X--A--B--Y    <- master
     \
      A--B--Z        <- topic

then 'git rebase -m master' would report:

    Already applied: 0001 Y
    Already applied: 0002 Y

With this fix it reports the expected:

    Already applied: 0001 A
    Already applied: 0002 B

As an added bonus, this change also avoids 'echo' of a commit message,
which might contain escapements.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase.sh
t/t3406-rebase-message.sh [new file with mode: 0755]