Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
This reverts commit 99855ddf4bd319cd06a0524e755ab1c1b7d39f3b. The workaround 99855ddf introduced to deal with problematic "return" statements in scripts run by "dot" commands located inside functions only handles one part of the problem. The issue has now been addressed by not using "return" statements in this way in the git-rebase--*.sh scripts. This workaround is therefore no longer necessary, so clean up the code by reverting it. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kyle J. McKay committed
Apr 11, 2014 at 01:28 UTC
8cd65967fe0084574fcee278a5f9ff3d14047c4f
1 file changed
+1
-10
git-rebase.sh
+1
-10
@@ -169,22 +169,13 @@ You can run "git stash pop" or "git stash drop" at any time.
169
rm -rf "$state_dir"
170
}
171
172
-run_specific_rebase_internal () {
172
+run_specific_rebase () {
173
if [ "$interactive_rebase" = implied ]; then
174
GIT_EDITOR=:
175
export GIT_EDITOR
176
autosquash=
177
fi
178
- # On FreeBSD, the shell's "return" returns from the current
179
- # function, not from the current file inclusion.
180
- # run_specific_rebase_internal has the file inclusion as a
181
- # last statement, so POSIX and FreeBSD's return will do the
182
- # same thing.
178
. git-rebase--$type
184
-}
185
-
186
-run_specific_rebase () {
187
- run_specific_rebase_internal
179
ret=$?
180
if test $ret -eq 0
181
then