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

diff --cc git-rebase--am.sh
index df46f4ca9629253238e94ae31ae26c77b452dde3,1cdc13944cf7cfc399515c41cef44f5e43f85660..ca20e1e66fbda7c27a8a4cfff03ecf02841e1002
--- 1/git-rebase--am.sh
--- 2/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@@ -4,10 -4,20 +4,21 @@@
  # Copyright (c) 2010 Junio C Hamano.
  #
  
+ # The whole contents of this file is run by dot-sourcing it from
+ # inside a shell function.  It used to be that "return"s we see
+ # below were not inside any function, and expected to return
+ # to the function that dot-sourced us.
+ #
+ # However, FreeBSD /bin/sh misbehaves on such a construct and
+ # continues to run the statements that follow such a "return".
+ # As a work-around, we introduce an extra layer of a function
+ # here, and immediately call it after defining it.
+ git_rebase__am () {
+ 
  case "$action" in
  continue)
 -      git am --resolved --resolvemsg="$resolvemsg" &&
 +      git am --resolved --resolvemsg="$resolvemsg" \
 +              ${gpg_sign_opt:+"$gpg_sign_opt"} &&
        move_to_original_branch
        return
        ;;

diff --cc git-rebase--interactive.sh
Simple merge

diff --cc git-rebase--merge.sh
Simple merge

diff --cc git-rebase.sh
Simple merge