summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-09-01 07:25:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-01 09:23:05 (GMT)
commit7afa845edc09d2818af5fe67a0eb45ec579d1260 (patch)
tree6e132b3f4b3d33a5216ea86c3b1c67607de898a9 /git-rebase.sh
parentaecbf914c43ab76e055fa8a25b12456ae74d91bc (diff)
downloadgit-7afa845edc09d2818af5fe67a0eb45ec579d1260.zip
git-7afa845edc09d2818af5fe67a0eb45ec579d1260.tar.gz
git-7afa845edc09d2818af5fe67a0eb45ec579d1260.tar.bz2
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh13
1 files changed, 8 insertions, 5 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index cbafa14..9cf0056 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -59,20 +59,23 @@ continue_merge () {
die "$RESOLVEMSG"
fi
+ cmt=`cat $dotest/current`
if ! git diff-index --quiet HEAD
then
- if ! git-commit -C "`cat $dotest/current`"
+ if ! git-commit -C "$cmt"
then
echo "Commit failed, please do not call \"git commit\""
echo "directly, but instead do one of the following: "
die "$RESOLVEMSG"
fi
- printf "Committed: %0${prec}d" $msgnum
+ printf "Committed: %0${prec}d " $msgnum
+ git rev-list --pretty=oneline -1 HEAD | \
+ sed 's/^[a-f0-9]\+ //'
else
- printf "Already applied: %0${prec}d" $msgnum
+ printf "Already applied: %0${prec}d " $msgnum
+ git rev-list --pretty=oneline -1 "$cmt" | \
+ sed 's/^[a-f0-9]\+ //'
fi
- echo ' '`git rev-list --pretty=oneline -1 HEAD | \
- sed 's/^[a-f0-9]\+ //'`
prev_head=`git rev-parse HEAD^0`
# save the resulting commit so we can read-tree on it later