undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2016-07-06 13:06:41 -07:00
commit af3a43cb11
3 changed files with 6 additions and 6 deletions

4
git-rebase--am.sh
View File

@ -9,8 +9,8 @@
# below were not inside any function, and expected to return # below were not inside any function, and expected to return
# to the function that dot-sourced us. # to the function that dot-sourced us.
# #
# However, FreeBSD /bin/sh misbehaves on such a construct and # However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
# continues to run the statements that follow such a "return". # construct and continue to run the statements that follow such a "return".
# As a work-around, we introduce an extra layer of a function # As a work-around, we introduce an extra layer of a function
# here, and immediately call it after defining it. # here, and immediately call it after defining it.
git_rebase__am () { git_rebase__am () {

4
git-rebase--interactive.sh
View File

@ -1038,8 +1038,8 @@ check_todo_list () {
# below were not inside any function, and expected to return # below were not inside any function, and expected to return
# to the function that dot-sourced us. # to the function that dot-sourced us.
# #
# However, FreeBSD /bin/sh misbehaves on such a construct and # However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
# continues to run the statements that follow such a "return". # construct and continue to run the statements that follow such a "return".
# As a work-around, we introduce an extra layer of a function # As a work-around, we introduce an extra layer of a function
# here, and immediately call it after defining it. # here, and immediately call it after defining it.
git_rebase__interactive () { git_rebase__interactive () {

4
git-rebase--merge.sh
View File

@ -107,8 +107,8 @@ finish_rb_merge () {
# below were not inside any function, and expected to return # below were not inside any function, and expected to return
# to the function that dot-sourced us. # to the function that dot-sourced us.
# #
# However, FreeBSD /bin/sh misbehaves on such a construct and # However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
# continues to run the statements that follow such a "return". # construct and continue to run the statements that follow such a "return".
# As a work-around, we introduce an extra layer of a function # As a work-around, we introduce an extra layer of a function
# here, and immediately call it after defining it. # here, and immediately call it after defining it.
git_rebase__merge () { git_rebase__merge () {