summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-21 10:42:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-21 10:42:46 -0700
commit0b17b4331087224883878e49342037bf69717b62 (patch)
tree36812666a6ea99efc7455c7437a5e560f3803d46 /git-rebase.sh
parent0e6e1a5fbdd3143b74bf45f009bb4e850bdc785a (diff)
parent8cd65967fe0084574fcee278a5f9ff3d14047c4f (diff)
downloadgit-0b17b4331087224883878e49342037bf69717b62.tar.gz
Merge branch 'km/avoid-non-function-return-in-rebase'
Work around /bin/sh that does not like "return" at the top-level of a file that is dot-sourced from inside a function definition. * km/avoid-non-function-return-in-rebase: Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" rebase: avoid non-function use of "return" on FreeBSD
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh11
1 files changed, 1 insertions, 10 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 2c75e9fa0f..4543815ffd 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -175,22 +175,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