Skip to content

Commit

Permalink
rebase -i: return control to caller, for housekeeping
Browse files Browse the repository at this point in the history
Return control to the caller git-rebase.sh to get these two tasks

    rm -fr "$dotest"
    git gc --auto

done by it.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ramkumar Ramachandra authored and Junio C Hamano committed May 13, 2013
1 parent a1549e1 commit 15d4bf2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -628,17 +628,16 @@ do_next () {
"$GIT_DIR"/hooks/post-rewrite rebase < "$rewritten_list"
true # we don't care if this hook failed
fi &&
rm -rf "$state_dir" &&
git gc --auto &&
warn "Successfully rebased and updated $head_name."

exit
return 1 # not failure; just to break the do_rest loop
}

# can only return 0, when the infinite loop breaks
do_rest () {
while :
do
do_next
do_next || break
done
}

Expand Down Expand Up @@ -805,11 +804,13 @@ first and then run 'git rebase --continue' again."

require_clean_work_tree "rebase"
do_rest
return 0
;;
skip)
git rerere clear

do_rest
return 0
;;
edit-todo)
git stripspace --strip-comments <"$todo" >"$todo".new
Expand Down

0 comments on commit 15d4bf2

Please sign in to comment.