Skip to content

Commit 01a1e64

Browse files
artagnongitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 15d4bf2 commit 01a1e64

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

git-rebase--merge.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ finish_rb_merge () {
9696
"$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
9797
fi
9898
fi
99-
rm -r "$state_dir"
10099
say All done.
101100
}
102101

@@ -110,7 +109,7 @@ continue)
110109
continue_merge
111110
done
112111
finish_rb_merge
113-
exit
112+
return
114113
;;
115114
skip)
116115
read_state
@@ -122,7 +121,7 @@ skip)
122121
continue_merge
123122
done
124123
finish_rb_merge
125-
exit
124+
return
126125
;;
127126
esac
128127

0 commit comments

Comments
 (0)