summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorEd Maste <emaste@freebsd.org>2016-06-17 15:33:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-17 18:04:38 (GMT)
commit9b35cadc2c7660745264041317f5982e1dde3f88 (patch)
treeeb053bb1813ae762896d8585b626568201c415ef /git-rebase--am.sh
parent765428699a5381f113d19974720bc91b5bfeaf1d (diff)
downloadgit-9b35cadc2c7660745264041317f5982e1dde3f88.zip
git-9b35cadc2c7660745264041317f5982e1dde3f88.tar.gz
git-9b35cadc2c7660745264041317f5982e1dde3f88.tar.bz2
rebase: update comment about FreeBSD /bin/sh
Commit 9f50d32 introduced a fix for FreeBSD /bin/sh misbehaviour when dot-sourcing a file containing "return" statements outside of any function, from a function in another shell script. That issue affects FreeBSD 9.x, and is not present in the /bin/sh in FreeBSD 10.3 and later. Update the comment to clarify this. The example from 9f50d32's commit message produces the expected output on FreeBSD 10.3 and -CURRENT (the upcoming 11.0): % sh script1.sh only this line should show % Signed-off-by: Ed Maste <emaste@freebsd.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 9ae898b..3752393 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -9,8 +9,8 @@
# 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".
+# 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 () {