rebase: update invocation of rebase dot-sourced scripts

Due to historical reasons, the backend scriptlets for "git rebase"
are structured a bit unusually. As originally designed,
dot-sourcing them from "git rebase" was sufficient to invoke the
specific backend.

However, it was later discovered that some shell implementations
(e.g. FreeBSD 9.x) misbehaved by continuing to execute statements
following a top-level "return" rather than returning control to
the next statement in "git rebase" after dot-sourcing the
scriptlet. To work around this shortcoming, the whole body of
git-rebase--$backend.sh was made into a shell function
git_rebase__$backend, and then the very last line of the scriptlet
called that function.

A more normal architecture is for a dot-sourced scriptlet merely
to define functions (thus acting as a function library), and for
those functions to be called by the script doing the dot-sourcing.
Migrate to this arrangement by moving the git_rebase__$backend
call from the end of a scriptlet into "git rebase" itself.

While at it, remove the large comment block from each scriptlet
explaining this historic anomaly since it serves no purpose under
the new normalized architecture in which a scriptlet is merely a
function library.

Signed-off-by: Wink Saville <wink@saville.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index be3f068922c5a3ba0d1112f3b8b1cf1228567d2e..e5fd6101db3018aff5fca7047eb2958291b6b03d 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -4,15 +4,6 @@
 # Copyright (c) 2010 Junio C Hamano.
 #
 
 # 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, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
-# construct and continue 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
 git_rebase__am () {
 
 case "$action" in


@@ -105,5 +96,3 @@ fi
 move_to_original_branch
 
 }
 move_to_original_branch
 
 }

-# ... and then we call the whole thing.
-git_rebase__am

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 561e2660ed424621ff2761a01557c1238bee6310..213d75f43b1d0d975b54e3fbb78537763c797dc9 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -740,15 +740,6 @@ get_missing_commit_check_level () {
        printf '%s' "$check_level" | tr 'A-Z' 'a-z'
 }
 
        printf '%s' "$check_level" | tr 'A-Z' 'a-z'
 }
 

-# 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, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
-# construct and continue 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__interactive () {
 
 case "$action" in
 git_rebase__interactive () {
 
 case "$action" in


@@ -1029,5 +1020,3 @@ fi
 do_rest
 
 }
 do_rest
 
 }

-# ... and then we call the whole thing.
-git_rebase__interactive

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index ceb715453cc9eba0b6e91abfd2ea3863e74f3e05..685f48ca49bcdac63f5577ac20daa2993be5e4a2 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -104,15 +104,6 @@ finish_rb_merge () {
        say All done.
 }
 
        say All done.
 }
 

-# 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, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
-# construct and continue 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__merge () {
 
 case "$action" in
 git_rebase__merge () {
 
 case "$action" in


@@ -171,5 +162,3 @@ done
 finish_rb_merge
 
 }
 finish_rb_merge
 
 }

-# ... and then we call the whole thing.
-git_rebase__merge

diff --git a/git-rebase.sh b/git-rebase.sh
index a1f6e5de6a3ed1fe9a6217a136611682f3db6582..6edf8c5b19137c096030de3b4c4512865016c4eb 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -197,6 +197,7 @@ run_specific_rebase () {
                autosquash=
        fi
        . git-rebase--$type
                autosquash=
        fi
        . git-rebase--$type

+       git_rebase__$type

        ret=$?
        if test $ret -eq 0
        then
        ret=$?
        if test $ret -eq 0
        then