mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'mg/rebase-i-onto-reflog-in-full'
The reflog entries left by "git rebase" and "git rebase -i" were inconsistent. * mg/rebase-i-onto-reflog-in-full: rebase -i: use full onto sha1 in reflog
This commit is contained in:
commit
4514de70c2
|
@ -569,11 +569,10 @@ do_next () {
|
|||
test -s "$todo" && return
|
||||
|
||||
comment_for_reflog finish &&
|
||||
shortonto=$(git rev-parse --short $onto) &&
|
||||
newhead=$(git rev-parse HEAD) &&
|
||||
case $head_name in
|
||||
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 symbolic-ref \
|
||||
-m "$GIT_REFLOG_ACTION: returning to $head_name" \
|
||||
|
|
Loading…
Reference in a new issue