summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-21 17:42:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-21 17:42:46 (GMT)
commit0b17b4331087224883878e49342037bf69717b62 (patch)
tree36812666a6ea99efc7455c7437a5e560f3803d46 /git-rebase--am.sh
parent0e6e1a5fbdd3143b74bf45f009bb4e850bdc785a (diff)
parent8cd65967fe0084574fcee278a5f9ff3d14047c4f (diff)
downloadgit-0b17b4331087224883878e49342037bf69717b62.zip
git-0b17b4331087224883878e49342037bf69717b62.tar.gz
git-0b17b4331087224883878e49342037bf69717b62.tar.bz2
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
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index df46f4c..ca20e1e 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -4,6 +4,17 @@
# 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" \
@@ -75,3 +86,7 @@ then
fi
move_to_original_branch
+
+}
+# ... and then we call the whole thing.
+git_rebase__am