[PATCH 2/3] Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
From: Kyle J. McKay <hidden>
Date: 2016-06-15 23:00:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
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.
Conflicts:
git-rebase.sh
Signed-off-by: Kyle J. McKay <redacted>
---
git-rebase.sh | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 8a3efa29..07e2bd48 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -169,22 +169,13 @@ You can run "git stash pop" or "git stash drop" at any time. rm -rf "$state_dir" } -run_specific_rebase_internal () { +run_specific_rebase () { if [ "$interactive_rebase" = implied ]; then GIT_EDITOR=: export GIT_EDITOR autosquash= fi - # On FreeBSD, the shell's "return" returns from the current - # function, not from the current file inclusion. - # run_specific_rebase_internal has the file inclusion as a - # last statement, so POSIX and FreeBSD's return will do the - # same thing. . git-rebase--$type -} - -run_specific_rebase () { - run_specific_rebase_internal ret=$? if test $ret -eq 0 then
--
tg: (1bb252a9..) t/revert-99855ddf (depends on: t/freebsd-sh-return)