Permalink
Browse files

rebase --merge: 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>
  • Loading branch information...
1 parent 15d4bf2 commit 01a1e6465fea95c2b4303ed6c9bd14b276456f2d @artagnon artagnon committed with gitster May 12, 2013
Showing with 2 additions and 3 deletions.
  1. +2 −3 git-rebase--merge.sh
@@ -96,7 +96,6 @@ finish_rb_merge () {
"$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
fi
fi
- rm -r "$state_dir"
say All done.
}
@@ -110,7 +109,7 @@ continue)
continue_merge
done
finish_rb_merge
- exit
+ return
;;
skip)
read_state
@@ -122,7 +121,7 @@ skip)
continue_merge
done
finish_rb_merge
- exit
+ return
;;
esac

0 comments on commit 01a1e64

Please sign in to comment.