Skip to content

Commit

Permalink
Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
Browse files Browse the repository at this point in the history
This reverts commit 99855dd.

The workaround 99855dd 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 <[email protected]>
Acked-by: Matthieu Moy <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
mackyle authored and gitster committed Apr 17, 2014
1 parent 9f50d32 commit 8cd6596
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8cd6596

Please sign in to comment.