undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"

Browse Source 
This reverts commit 99855ddf4b.

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>
This commit is contained in:
Kyle J. McKay 2014-04-11 01:28:18 -07:00 committed by Junio C Hamano
parent 9f50d32b9c
commit 8cd65967fe
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-rebase.sh
View File

@ -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