summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:52 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-27 09:56:52 -0700
commit3ec9150a8cff7ec2531e853b00407f40ca3624ab (patch)
tree15984f7c43d087c108c3687abddd68ac4ffd60ad /git-rebase--interactive.sh
parenta010d61e8819205b153afe00744f882e5761b424 (diff)
parent9b35cadc2c7660745264041317f5982e1dde3f88 (diff)
downloadgit-3ec9150a8cff7ec2531e853b00407f40ca3624ab.tar.gz
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'
Comments about misbehaving FreeBSD shells have been clarified with the version number (9.x and before are broken, newer ones are OK). * em/newer-freebsd-shells-are-fine-with-returns: rebase: update comment about FreeBSD /bin/sh
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6e96abcc3c..05f22e43cc 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1038,8 +1038,8 @@ check_todo_list () {
# 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__interactive () {