Browse Source

rebase -i: return control to caller, for housekeeping

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>
maint
Ramkumar Ramachandra 12 years ago committed by Junio C Hamano
parent
commit
15d4bf2e1e
  1. 9
      git-rebase--interactive.sh

9
git-rebase--interactive.sh

@ -628,17 +628,16 @@ do_next () { @@ -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
}

@ -805,11 +804,13 @@ first and then run 'git rebase --continue' again." @@ -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

Loading…
Cancel
Save