[PATCH 6/7] rebase --merge: return control to caller, for housekeeping
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted>
---
git-rebase--merge.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index b10f2cf..16d1817 100644
--- a/git-rebase--merge.sh
+++ b/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
--
1.8.3.rc1.51.gd7a04de