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>
Ramkumar Ramachandra committed
May 12, 2013 at 17:26 UTC
01a1e6465fea95c2b4303ed6c9bd14b276456f2d
1 file changed
+2
-3
git-rebase--merge.sh
+2
-3
@@ -96,7 +96,6 @@ finish_rb_merge () {
96
"$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
97
fi
98
fi
99
- rm -r "$state_dir"
99
say All done.
100
}
101
@@ -110,7 +109,7 @@ continue)
109
continue_merge
110
done
111
finish_rb_merge
113
- exit
112
+ return
113
;;
114
skip)
115
read_state
@@ -122,7 +121,7 @@ skip)
121
continue_merge
122
done
123
finish_rb_merge
125
- exit
124
+ return
125
;;
126
esac
127