diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-05-08 10:01:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-05-08 10:01:06 -0700 |
commit | e79fcfcd3f95b1a6b4df11b889c69a80864354b0 (patch) | |
tree | 3edaf8c525e6ef917a844e39384c4df02d75888a /git-rebase.sh | |
parent | e230cd861bc1c1cbb0743800d6ade853898a38db (diff) | |
parent | 8cd65967fe0084574fcee278a5f9ff3d14047c4f (diff) | |
download | git-e79fcfcd3f95b1a6b4df11b889c69a80864354b0.tar.gz |
Merge branch 'km/avoid-non-function-return-in-rebase' into maint
"git rebase" used a POSIX shell construct FreeBSD /bin/sh does not
work well with.
* 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-x | git-rebase.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 8a3efa2983..07e2bd48dc 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 |