| commit | 99855ddf4bd319cd06a0524e755ab1c1b7d39f3b | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Mon, 9 Sep 2013 08:53:15 +0000 (9 10:53 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Sep 2013 15:46:16 +0000 (9 08:46 -0700) | ||
| tree | 0b5b8b669f0edf45d57b7c166b5af7907313c980 | treesnapshot (tar.gz zip) |
| parent | 15d4bf2e1e4f9853a17a86eb923b55d41da22d54 | commitdiff |
rebase: fix run_specific_rebase's use of "return" on FreeBSD
Since a1549e10, git-rebase--am.sh uses the shell's "return" statement, to
mean "return from the current file inclusion", which is POSIXly correct,
but badly interpreted on FreeBSD, which returns from the current
function, hence skips the finish_rebase statement that follows the file
inclusion.
Make the use of "return" portable by using the file inclusion as the last
statement of a function.
Reported-by: Christoph Mallon <christoph.mallon@gmx.de>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since a1549e10, git-rebase--am.sh uses the shell's "return" statement, to
mean "return from the current file inclusion", which is POSIXly correct,
but badly interpreted on FreeBSD, which returns from the current
function, hence skips the finish_rebase statement that follows the file
inclusion.
Make the use of "return" portable by using the file inclusion as the last
statement of a function.
Reported-by: Christoph Mallon <christoph.mallon@gmx.de>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory |