From: Alexander Kostikov <alex.kostikov@gmail.com>
To: Andrew Wong <andrew.kw.w@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: Rebase doesn't restore branch pointer back on out of memory
Date: Fri, 19 Oct 2012 14:49:11 -0700 [thread overview]
Message-ID: <CAGAhT3nNdPxtDKtVCnPAa4OWOhGygzoq6DqHVEckQ60XWAAKZA@mail.gmail.com> (raw)
In-Reply-To: <1349927643-7195-1-git-send-email-andrew.kw.w@gmail.com>
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 <andrew.kw.w@gmail.com> wrote:
>
> 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-block:
>
> fi && move_to_original_branch
>
> then, before exiting the if-block, we would have to do something like:
>
> test 0 != $ret && false
>
> which seems a bit ugly to me. So I removed the use of '&&', and rearrange the
> 'write_basic_state' and 'move_to_original_branch' to make the logic flow a bit
> better and easier to read.
>
> Andrew Wong (1):
> rebase: Handle cases where format-patch fails
>
> git-rebase--am.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 45 insertions(+), 6 deletions(-)
>
> --
> 1.8.0.rc0.19.gc58a63a.dirty
>
--
Alexander Kostikov
next prev parent reply other threads:[~2012-10-19 21:49 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
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 ` Alexander Kostikov [this message]
2012-10-19 22:24 ` Rebase doesn't restore branch pointer back on out of memory 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=CAGAhT3nNdPxtDKtVCnPAa4OWOhGygzoq6DqHVEckQ60XWAAKZA@mail.gmail.com \
--to=alex.kostikov@gmail.com \
--cc=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).