Alexander Kostikov writes:
> Sorry to bother but I was wondering what would be the release version
> that would have this patch.
That depends on how well the people who are interested in this
change test it to smoke out potential issues (if any) in it.
It currently is on the 'pu' branch.
--
To
Sorry to bother but I was wondering what would be the release version
that would have this patch.
-- Alexander
On Wed, Oct 10, 2012 at 8:54 PM, Andrew Wong wrote:
>
> For the 'format-patch' part, originally I was going to do something like:
>
> git format-patch ... || {
>
For the 'format-patch' part, originally I was going to do something like:
git format-patch ... || {
...
}
But later I thought it's better to use a consistent style as the following
'am' part.
For the 'am' part, if we kept the following line at the end of the if-bl
'format-patch' is failing due to out of memory, and the error not being caught.
So 'rebase' thinks 'am' has completed successfully and continue on with
cleanup. i.e. move_to_original_branch
So the user loses commits from the original head, and have to rely on reflog to
return to the original head.
Thanks, Andrew!
I'm looking forward for the patch.
On Thu, Oct 4, 2012 at 3:52 PM, Andrew Wong wrote:
> On 10/04/2012 05:09 PM, Alexander Kostikov wrote:
>>
>> Full script is uploaded to
>> https://dl.dropbox.com/u/10828740/rebase.log Here is the last page:
>
> Judging from that log, I'm pretty
On 10/04/2012 05:09 PM, Alexander Kostikov wrote:
Full script is uploaded to
https://dl.dropbox.com/u/10828740/rebase.log Here is the last page:
Judging from that log, I'm pretty sure "rebase" is failing at
"format-patch". I was able to reproduce the issue you're having:
"rebase" finished and
> rebase -i fails with different error:
Also in case of rebase -i the branch pointer is not changed. Thus
nothing to fix there.
-- Alexander
On Thu, Oct 4, 2012 at 2:09 PM, Alexander Kostikov
wrote:
>> Having the
>> last page of that output should give us enough context as to where it's
>> faili
> Having the
> last page of that output should give us enough context as to where it's
> failing.
Full script is uploaded to
https://dl.dropbox.com/u/10828740/rebase.log Here is the last page:
---[code]
if test -s "$dotest"/rewritten; then
git notes copy --for-r
On 10/03/2012 06:35 PM, Alexander Kostikov wrote:
That allows you can go back to the pre-rebase state by
"rebase --abort".
rebase --abort command were not available. I guess rebase file was not created.
I meant "rebase --abort" would be available *if* the error was caught by
"rebase". But in yo
On 10/03/2012 03:47 PM, Alexander Kostikov wrote:
Expected behaviour:
- restore branch to pre-rebase location on out of memory exception
- not to fall with out of memory in the first place. But for our
repository that could be fixed only after either:
--- a) msysgit would have x64 binary (current
10 matches
Mail list logo
