From: Alexander Kostikov Date: Fri, 19 Oct 2012 21:49:11 GMT Subject: Re: Rebase doesn't restore branch pointer back on out of memory Message-ID: 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 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