Re: [PATCH] rebase: fix run_specific_rebase's use of "return" on FreeBSD
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 9, 2013, 15:44 UTC
- Message-ID
- <xmqqzjrm3sp0.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1378716795-5420-1-git-send-email-Matthieu.Moy@imag.fr>
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
Show 14 quoted lines
> 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> > --- > I sent the patch inline in a conversation and got no feedback. > Resending as a proper patch.
I'll replace mm/rebase-continue-freebsd-WB with this version, but it would be nice to hear from FreeBSD folks that this is sufficient for their platform to work around the issue (e.g. there could be other "return"s unfixed outside the codepath this patch fixes).
Thanks.
Show 31 quoted lines
> git-rebase.sh | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 8d7659a..226752f 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -167,13 +167,22 @@ You can run "git stash pop" or "git stash drop" at any time.
> rm -rf "$state_dir"
> }
>
> -run_specific_rebase () {
> +run_specific_rebase_internal () {
> if [ "$interactive_rebase" = implied ]; then
> GIT_EDITOR=:
> export GIT_EDITOR
> autosquash=
> fi
> + # On FreeBSD, the shell's "return" returns from the current
> + # function, not from the current file inclusion.
> + # run_specific_rebase_internal has the file inclusion as a
> + # last statement, so POSIX and FreeBSD's return will do the
> + # same thing.
> . git-rebase--$type
> +}
> +
> +run_specific_rebase () {
> + run_specific_rebase_internal
> ret=$?
> if test $ret -eq 0
> then