Skip to content

Commit af3a43c

Browse files
committed
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint
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
2 parents 89aef71 + 9b35cad commit af3a43c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

git-rebase--am.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# below were not inside any function, and expected to return
1010
# to the function that dot-sourced us.
1111
#
12-
# However, FreeBSD /bin/sh misbehaves on such a construct and
13-
# continues to run the statements that follow such a "return".
12+
# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
13+
# construct and continue to run the statements that follow such a "return".
1414
# As a work-around, we introduce an extra layer of a function
1515
# here, and immediately call it after defining it.
1616
git_rebase__am () {

git-rebase--interactive.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,8 +1038,8 @@ check_todo_list () {
10381038
# below were not inside any function, and expected to return
10391039
# to the function that dot-sourced us.
10401040
#
1041-
# However, FreeBSD /bin/sh misbehaves on such a construct and
1042-
# continues to run the statements that follow such a "return".
1041+
# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
1042+
# construct and continue to run the statements that follow such a "return".
10431043
# As a work-around, we introduce an extra layer of a function
10441044
# here, and immediately call it after defining it.
10451045
git_rebase__interactive () {

git-rebase--merge.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ finish_rb_merge () {
107107
# below were not inside any function, and expected to return
108108
# to the function that dot-sourced us.
109109
#
110-
# However, FreeBSD /bin/sh misbehaves on such a construct and
111-
# continues to run the statements that follow such a "return".
110+
# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
111+
# construct and continue to run the statements that follow such a "return".
112112
# As a work-around, we introduce an extra layer of a function
113113
# here, and immediately call it after defining it.
114114
git_rebase__merge () {

0 commit comments

Comments
 (0)