undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11

Browse Source 
The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).

* mg/rebase-i-onto-reflog-in-full:
  rebase -i: use full onto sha1 in reflog
This commit is contained in:
Junio C Hamano 2012-09-10 15:26:03 -07:00
commit 73eb89e759
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase--interactive.sh
View File

@ -548,11 +548,10 @@ do_next () {
test -s "$todo" && return test -s "$todo" && return
comment_for_reflog finish && comment_for_reflog finish &&
shortonto=$(git rev-parse --short $onto) &&
newhead=$(git rev-parse HEAD) && newhead=$(git rev-parse HEAD) &&
case $head_name in case $head_name in
refs/*) refs/*)
message="$GIT_REFLOG_ACTION: $head_name onto $shortonto" && message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
git update-ref -m "$message" $head_name $newhead $orig_head && git update-ref -m "$message" $head_name $newhead $orig_head &&
git symbolic-ref \ git symbolic-ref \
-m "$GIT_REFLOG_ACTION: returning to $head_name" \ -m "$GIT_REFLOG_ACTION: returning to $head_name" \