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

rebase --abort: do not update branch ref

Browse Source 
If a non-interactive rebase of a ref fails at commit X and is aborted by
the user, the ref will be updated twice. First to point at X (with the
reflog message "rebase finished: $head_name onto $onto"), and then back
to $orig_head. It should not be updated at all.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin von Zweigbergk 2010-11-21 12:11:21 +01:00 committed by Junio C Hamano
parent 1c7d402b3e
commit 729ec9e23a
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
git-rebase.sh
View File

@ -274,15 +274,16 @@ do
die "No rebase in progress?" die "No rebase in progress?"
git rerere clear git rerere clear
if test -d "$dotest"
then test -d "$dotest" || dotest="$GIT_DIR"/rebase-apply
GIT_QUIET=$(cat "$dotest/quiet")
move_to_original_branch head_name="$(cat "$dotest"/head-name)" &&
else case "$head_name" in
dotest="$GIT_DIR"/rebase-apply refs/*)
GIT_QUIET=$(cat "$dotest/quiet") git symbolic-ref HEAD $head_name ||
move_to_original_branch die "Could not move back to $head_name"
fi ;;
esac
git reset --hard $(cat "$dotest/orig-head") git reset --hard $(cat "$dotest/orig-head")
rm -r "$dotest" rm -r "$dotest"
exit exit

12
t/t3407-rebase-abort.sh
View File

@ -72,6 +72,18 @@ testrebase() {
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) && test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
test ! -d "$dotest" test ! -d "$dotest"
' '
test_expect_success "rebase$type --abort does not update reflog" '
cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
git reflog show to-rebase > reflog_before &&
test_must_fail git rebase$type master &&
git rebase --abort &&
git reflog show to-rebase > reflog_after &&
test_cmp reflog_before reflog_after &&
rm reflog_before reflog_after
'
} }
testrebase "" .git/rebase-apply testrebase "" .git/rebase-apply