From: Marc Branchaud <marcnarc@xiplink.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>,
"Junio C Hamano" <gitster@pobox.com>,
"Johannes Sixt" <j6t@kdbg.org>,
konglu@minatec.inpg.fr,
"Lucien Kong" <Lucien.Kong@ensimag.imag.fr>,
git@vger.kernel.org,
"Valentin Duperray" <Valentin.Duperray@ensimag.imag.fr>,
"Franck Jonas" <Franck.Jonas@ensimag.imag.fr>,
"Thomas Nguy" <Thomas.Nguy@ensimag.imag.fr>,
"Huynh Khoi Nguyen Nguyen"
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
Subject: Re: [PATCHv5] rebase [-i --exec | -ix] <CMD>...
Date: Thu, 14 Jun 2012 10:08:09 -0400 [thread overview]
Message-ID: <4FD9F049.1030808@xiplink.com> (raw)
In-Reply-To: <vpqr4ticre1.fsf@bauges.imag.fr>
On 12-06-14 02:57 AM, Matthieu Moy wrote:
> Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> writes:
>
>>> Shouldn't "rebase --continue" after such a "commit --amend" resume
>>> execution from "exec cmd1", which failed in the initial run?
+1 for Junio's proposal.
Currently the only time --continue moves on to the next insn is in the "edit"
case, when everything up to that point (including applying the "edit" commit)
is fine. But if the rebase halted due to a problem, --continue ensures the
problem is fixed before moving on to the next insn (e.g. it makes sure a
merge conflict is resolved).
I think it makes the most sense for --continue after an exec-failure to try
to re-run the exec. Furthermore, --skip after an exec failure should just
skip the exec.
To me that makes --continue's (and --skip's) behaviour consistent with what
it does when any other insn operation fails. In other words, if the rebase
hits an exec failure, the user is going to want to fix it before continuing
(just like any other failure during a rebase). If the user decides to not
fix the failing exec, they can --skip it.
M.
next prev parent reply other threads:[~2012-06-14 14:09 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-04 13:47 [PATCH] rebase [-i --exec | -ix] <CMD> Kong Lucien
2012-06-04 17:42 ` Junio C Hamano
2012-06-04 20:30 ` Matthieu Moy
2012-06-04 21:06 ` Junio C Hamano
2012-06-05 17:59 ` konglu
2012-06-05 18:13 ` Junio C Hamano
2012-06-04 17:48 ` Matthieu Moy
2012-06-06 10:34 ` [PATCHv2] " Lucien Kong
2012-06-06 20:03 ` Matthieu Moy
2012-06-06 22:54 ` Junio C Hamano
2012-06-07 8:25 ` Zbigniew Jędrzejewski-Szmek
2012-06-07 8:40 ` Johannes Sixt
2012-06-07 12:04 ` konglu
2012-06-07 13:43 ` Matthieu Moy
2012-06-08 14:53 ` [PATCHv3 1/2] git-rebase.txt: "--onto" option updated Lucien Kong
2012-06-08 14:53 ` [PATCHv3 2/2] rebase [-i --exec | -ix] <CMD> Lucien Kong
2012-06-08 17:02 ` Johannes Sixt
2012-06-08 18:56 ` Torsten Bögershausen
2012-06-08 19:15 ` konglu
2012-06-08 19:55 ` Torsten Bögershausen
2012-06-08 20:07 ` konglu
2012-06-08 20:51 ` Torsten Bögershausen
2012-06-08 21:03 ` konglu
2012-06-09 6:14 ` Torsten Bögershausen
2012-06-09 6:47 ` konglu
2012-06-10 10:44 ` [PATCHv4] " Lucien Kong
2012-06-10 11:56 ` Johannes Sixt
2012-06-11 15:14 ` Junio C Hamano
2012-06-12 18:55 ` Johannes Sixt
2012-06-12 20:29 ` Junio C Hamano
2012-06-12 8:05 ` [PATCHv5] " Lucien Kong
2012-06-12 9:23 ` Zbigniew Jędrzejewski-Szmek
2012-06-12 14:46 ` Junio C Hamano
2012-06-13 14:04 ` Zbigniew Jędrzejewski-Szmek
2012-06-13 17:32 ` Junio C Hamano
2012-06-13 18:05 ` konglu
2012-06-13 18:22 ` Junio C Hamano
2012-06-13 19:38 ` konglu
2012-06-13 20:59 ` Johannes Sixt
2012-06-13 21:07 ` Zbigniew Jędrzejewski-Szmek
2012-06-13 22:25 ` Junio C Hamano
2012-06-13 22:35 ` Junio C Hamano
2012-06-13 22:43 ` Zbigniew Jędrzejewski-Szmek
2012-06-14 6:57 ` Matthieu Moy
2012-06-14 14:08 ` Marc Branchaud [this message]
2012-06-08 15:00 ` [PATCHv3 1/2] git-rebase.txt: "--onto" option updated Matthieu Moy
2012-06-08 17:07 ` Junio C Hamano
2012-06-08 19:06 ` konglu
2012-06-08 19:52 ` Junio C Hamano
2012-06-08 20:08 ` konglu
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=4FD9F049.1030808@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=konglu@minatec.inpg.fr \
--cc=zbyszek@in.waw.pl \
/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).