Since a1549e10, 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

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 <>
I sent the patch inline in a conversation and got no feedback.
Resending as a proper patch. | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ b/
index 8d7659a..226752f 100755
--- a/
+++ b/
@@ -167,13 +167,22 @@ You can run "git stash pop" or "git stash drop" at any 
        rm -rf "$state_dir"
-run_specific_rebase () {
+run_specific_rebase_internal () {
        if [ "$interactive_rebase" = implied ]; then
                export GIT_EDITOR
+       # 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
        if test $ret -eq 0

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to