[RFC PATCH v3.1 2/9 2/2] rebase-interactive: Do not automatically run code
- From
Wink Saville <wink@saville.com>
- Date
- Mar 22, 2018, 20:03 UTC
- Message-ID
- <7ce3cfef9ff3ab97ac8292fae94a0024a1d85505.1521748846.git.wink@saville.com>
- In-Reply-To
- <CAKk8isoL--f1gt_p5XZ99ybN+xts=0_AKBo52Ej=n3SMPoMq3A@mail.gmail.com>
At Junio's suggestion have git-rebase--am and git-rebase--merge work the same way as git-rebase--interactive. This makes the code more consistent.
Signed-off-by: Wink Saville <wink@saville.com> --- git-rebase--am.sh | 17 ++++++----------- git-rebase--interactive.sh | 8 +++++++- git-rebase--merge.sh | 17 ++++++----------- git-rebase.sh | 13 ++++--------- 4 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index be3f06892..47dc69ed9 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -4,17 +4,14 @@ # 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. +# The whole contents of this file is loaded by dot-sourcing it from +# inside another shell function, hence no shebang on the first line +# and then the caller invokes git_rebase__am. # -# 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. +# Previously this file was sourced and it called itself to get this +# was to get around a bug in older (9.x) versions of FreeBSD. git_rebase__am () { - +echo "git_rebase_am:+" 1>&5 case "$action" in continue) git am --resolved --resolvemsg="$resolvemsg" \ @@ -105,5 +102,3 @@ fi 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 213d75f43..48f358333 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -740,8 +740,14 @@ get_missing_commit_check_level () { printf '%s' "$check_level" | tr 'A-Z' 'a-z' } +# The whole contents of this file is loaded by dot-sourcing it from +# inside another shell function, hence no shebang on the first line +# and then the caller invokes git_rebase__interactive. +# +# Previously this file was sourced and it called itself to get this +# was to get around a bug in older (9.x) versions of FreeBSD. git_rebase__interactive () { - +echo "git_rebase_interactive:+" 1>&5 case "$action" in continue) if test ! -d "$rewritten" diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index ceb715453..71de80788 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -104,17 +104,14 @@ finish_rb_merge () { 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. +# The whole contents of this file is loaded by dot-sourcing it from +# inside another shell function, hence no shebang on the first line +# and then the caller invokes git_rebase__merge. # -# 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. +# Previously this file was sourced and it called itself to get this +# was to get around a bug in older (9.x) versions of FreeBSD. git_rebase__merge () { - +echo "git_rebase_merge:+" 1>&5 case "$action" in continue) read_state @@ -171,5 +168,3 @@ done finish_rb_merge } -# ... and then we call the whole thing. -git_rebase__merge diff --git a/git-rebase.sh b/git-rebase.sh index c4ec7c21b..4595a316a 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -196,15 +196,10 @@ run_specific_rebase () { export GIT_EDITOR autosquash= fi - if test "$type" = interactive - then - . git-rebase--interactive - git_rebase__interactive - ret=$? - else - . git-rebase--$type - ret=$? - fi + # Source the code and invoke it + . git-rebase--$type + git_rebase__$type + ret=$? if test $ret -eq 0 then finish_rebase
-- 2.16.2