From: Johannes Sixt <j6t@kdbg.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Small rerere in rebase regression
Date: Tue, 24 May 2016 21:48:29 +0200 [thread overview]
Message-ID: <5744B00D.4020006@kdbg.org> (raw)
In-Reply-To: <alpine.DEB.2.20.1605241510370.4449@virtualbox>
Am 24.05.2016 um 15:18 schrieb Johannes Schindelin:
> Hannes, could you quickly test whether
> https://github.com/dscho/git/tree/interactive-rebase calls rerere twice,
> too? (Please call interactive rebase with the GIT_USE_REBASE_HELPER=true
> to avoid running the interactive rebase twice.)
>
> I have a hunch that it does not call rerere twice, which would be a nice
> bonus in that patch thicket
It prints the message only once:
gittest@master:1007> GIT_USE_REBASE_HELPER=true git rebase -i side
error: could not apply fa62fea... master
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase
--abort".
Recorded preimage for 'a'
Could not apply fa62fea... mastergittest@master|REBASE-i 1/1:1008> 5~
(Take note of the missing LF at the end of the message.)
Can this result be interpreted as another indication that the "git
rerere" call in die_with_patch can be removed, or are the two git-rebase
implementations too different to be comparable?
-- Hannes
next prev parent reply other threads:[~2016-05-24 19:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-23 18:01 Small rerere in rebase regression Johannes Sixt
2016-05-23 19:43 ` Junio C Hamano
2016-05-23 21:30 ` Johannes Sixt
2016-05-23 22:11 ` Junio C Hamano
2016-05-24 13:18 ` Johannes Schindelin
2016-05-24 19:48 ` Johannes Sixt [this message]
2016-05-25 5:38 ` Johannes Schindelin
2016-05-25 5:47 ` Johannes Schindelin
2016-05-27 16:28 ` Johannes Sixt
2016-05-28 6:39 ` Johannes Schindelin
2016-05-24 20:46 ` Johannes Sixt
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=5744B00D.4020006@kdbg.org \
--to=j6t@kdbg.org \
--cc=Johannes.Schindelin@gmx.de \
--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).