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

Merge branch 'mz/rebase-abort-reflog-fix'

Browse Source 
* mz/rebase-abort-reflog-fix:
  rebase --abort: do not update branch ref
This commit is contained in:
Junio C Hamano 2010-12-12 21:49:51 -08:00
commit 6b236bfcb0
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

@ -275,15 +275,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