From 99855ddf4bd319cd06a0524e755ab1c1b7d39f3b Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 9 Sep 2013 10:53:15 +0200 Subject: [PATCH] rebase: fix run_specific_rebase's use of "return" on FreeBSD Since a1549e10, git-rebase--am.sh uses the shell's "return" statement, to mean "return from the current file inclusion", which is POSIXly correct, but badly interpreted on FreeBSD, which returns from the current function, hence skips the finish_rebase statement that follows the file inclusion. Make the use of "return" portable by using the file inclusion as the last statement of a function. Reported-by: Christoph Mallon Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- git-rebase.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index f8b533d183..7ab6434a4f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -143,13 +143,22 @@ move_to_original_branch () { esac } -run_specific_rebase () { +run_specific_rebase_internal () { 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 -- 2.11.4.GIT