зеркало из https://github.com/microsoft/git.git
Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
This reverts commit99855ddf4b
. The workaround99855ddf
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:
Родитель
9f50d32b9c
Коммит
8cd65967fe
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче