Re: [PATCH] rebase: fix run_specific_rebase's use of "return" on FreeBSD

2013-09-09 Thread Junio C Hamano
Matthieu Moy writes: > 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 f

Re: [PATCH] rebase: fix run_specific_rebase's use of "return" on FreeBSD

2013-09-09 Thread Ramkumar Ramachandra
Matthieu Moy wrote: > 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 () { > +ru

[PATCH] rebase: fix run_specific_rebase's use of "return" on FreeBSD

2013-09-09 Thread Matthieu Moy
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. Mak