Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Matthieu Moy
Andriy Gapon writes: > This looks like bug in FreeBSD shell indeed. Yes: the testsuite would have caught it otherwise. > If a script is sourced within a function scope, then 'return' in the script > causes the function to return. But it should cause the sourced script to > return. OK, so thi

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Andriy Gapon
This looks like bug in FreeBSD shell indeed. If a script is sourced within a function scope, then 'return' in the script causes the function to return. But it should cause the sourced script to return. I'll see what we can do about this. Sorry for distracting you. And thank you for the help! --

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Andriy Gapon
on 04/09/2013 11:18 Matthieu Moy said the following: > [ Cc-ing Ram, as he is the author of the possibly guilty commit. ] > > Andriy Gapon writes: >> Judging by the lack of followups, could this be a FreeBSD-specific problem? > > I can't reproduce here (Debian GNU/Linux). Do the testsuite pass f

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Matthieu Moy
[ Cc-ing Ram, as he is the author of the possibly guilty commit. ] Andriy Gapon writes: > Christoph Mallon said: >> if I run rebase --continue (e.g. after a conflict resolution), then the >> rebase always ends with this error message: >> It seems that there is already a rebase-apply direct

Re: Bug in git rebase --continue in v1.8.4

2013-09-04 Thread Andriy Gapon
Christoph Mallon said: > if I run rebase --continue (e.g. after a conflict resolution), then the > rebase always ends with this error message: > It seems that there is already a rebase-apply directory, and > I wonder if you are in the middle of another rebase. If that is the > c

Bug in git rebase --continue in v1.8.4

2013-08-31 Thread Christoph Mallon
Hi, if I run rebase --continue (e.g. after a conflict resolution), then the rebase always ends with this error message: It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case, please try