From: Alexander Kostikov <alex.kostikov@gmail.com>
To: Andrew Wong <andrew.kw.w.lists@gmail.com>
Cc: git list <git@vger.kernel.org>
Subject: Re: Rebase doesn't restore branch pointer back on out of memory
Date: Thu, 4 Oct 2012 14:09:03 -0700 [thread overview]
Message-ID: <CAGAhT3k=T0SGngMQkbXHqNfh-=LUb71C7CSrWXP2wsAgc8Tb8A@mail.gmail.com> (raw)
In-Reply-To: <506DA7AE.50005@gmail.com>
> 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-rewrite=rebase < "$dotest"/rewritten
if test -x "$GIT_DIR"/hooks/post-rewrite; then
"$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
fi
fi
rm -fr "$dotest"
git gc --auto
git rev-parse HEAD
ret=$?
test 0 != $ret -a -d "$state_dir" && write_basic_state
exit $ret
-----------------------------------[/code]
> It'd also be interesting to see if "rebase -i" will also workaround the
> issue.
rebase -i fails with different error:
» git rebase -i master rebase_debug
fatal: Out of memory, malloc failed (tried to allocate 458753 bytes)
Do you need verbose log for it as well?
-- Alexander
On Thu, Oct 4, 2012 at 8:13 AM, Andrew Wong <andrew.kw.w.lists@gmail.com> wrote:
> 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 your case, "rebase" is probably dying somewhere and the
> error was not caught, causing "rebase" to think that everything completed
> successfully, and go ahead to update the branch.
>
>
>> Is there a way to include some log verbose mode to detect where
>> exactly error happens?
>
> There isn't any built-in to git itself. But one way to get more info is
> running the rebase command this way:
> env SHELLOPTS="verbose" git rebase <your arguments>
>
> That should print out every shell command that rebase executes. Having the
> last page of that output should give us enough context as to where it's
> failing.
>
> Just a wild guess: rebase is probably failing at the "format-patch" command.
> It'd also be interesting to see if "rebase -i" will also workaround the
> issue. But like you said, there's no way set "-i" or "-m" as the default.
--
Alexander Kostikov
next prev parent reply other threads:[~2012-10-04 22:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-03 19:47 Rebase doesn't restore branch pointer back on out of memory Alexander Kostikov
2012-10-03 21:52 ` Andrew Wong
[not found] ` <CAGAhT3mVn-W5P-n_YeafZ_7bntkJGArJ3o6+dA5GO_H44=KHFg@mail.gmail.com>
2012-10-04 15:13 ` Andrew Wong
2012-10-04 21:09 ` Alexander Kostikov [this message]
2012-10-04 21:39 ` Alexander Kostikov
2012-10-04 22:52 ` Andrew Wong
2012-10-04 23:59 ` Alexander Kostikov
2012-10-05 4:53 ` Andrew Wong
2012-10-05 4:53 ` [RFC] rebase: Handle cases where format-patch fails Andrew Wong
2012-10-05 20:17 ` Junio C Hamano
2012-10-08 19:36 ` Andrew Wong
2012-10-08 19:36 ` Andrew Wong
2012-10-08 22:38 ` Junio C Hamano
2012-10-11 3:54 ` Rebase doesn't restore branch pointer back on out of memory Andrew Wong
2012-10-11 3:54 ` [PATCH] rebase: Handle cases where format-patch fails Andrew Wong
2012-10-19 21:49 ` Rebase doesn't restore branch pointer back on out of memory Alexander Kostikov
2012-10-19 22:24 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGAhT3k=T0SGngMQkbXHqNfh-=LUb71C7CSrWXP2wsAgc8Tb8A@mail.gmail.com' \
--to=alex.kostikov@gmail.com \
--cc=andrew.kw.w.lists@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).