summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-05-12 17:26:40 +0530
committerJunio C Hamano <gitster@pobox.com>2013-05-12 23:20:08 -0700
commit01a1e6465fea95c2b4303ed6c9bd14b276456f2d (patch)
tree208190ed7e1e8f463bff88ded3bad379a6370fb0 /git-rebase--merge.sh
parent15d4bf2e1e4f9853a17a86eb923b55d41da22d54 (diff)
downloadgit-01a1e6465fea95c2b4303ed6c9bd14b276456f2d.tar.gz
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>
Diffstat (limited to 'git-rebase--merge.sh')
-rw-r--r--git-rebase--merge.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index b10f2cf21b..16d18176ec 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