зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
af3a43cb11
|
@ -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 () {
|
||||
|
|
|
@ -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 () {
|
||||
|
|
|
@ -107,8 +107,8 @@ finish_rb_merge () {
|
|||
# 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__merge () {
|
||||
|
|
Загрузка…
Ссылка в новой задаче