From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git List <git@vger.kernel.org>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 7/7] sequencer: Remove sequencer state after final commit
Date: Fri, 19 Aug 2011 01:36:05 +0530 [thread overview]
Message-ID: <CALkWK0nV35gNFM2NW-FrwBLnvFzmWDdARZk0Xy6LT8c2UE0fAw@mail.gmail.com> (raw)
In-Reply-To: <CALkWK0=jRAq6s1zQ5gwB4feBgC1eo=VYLWx8bsjs+exqmz0f1A@mail.gmail.com>
HI again,
Ramkumar Ramachandra writes:
> One final resort: Move some code back into cherry-pick, and call into
> a later-function in the sequencer only if it's a many-commit
> operation. The new commands can enjoy the comfort of calling into an
> earlier-function in the sequencer that'll do all the revision walk
> setup and call the later-function. I think this is reasonable.
Er, no. This would be amazingly ugly too: we'd need two versions of
everything like '--continue'. And look at this glaring inconsistency:
git cherry-pick foo..bar
..conflict..
git sequencer --abort
$? = 0
But:
git cherry-pick foo
..conflict..
git sequencer --abort
error: No sequencer operation in progress.
In a nutshell, the problem we're facing: We persist part of the
continuation data outside the sequencer's knowledge, and part of it
inside. For backward compatibility, we can't move the former part
into the sequencer.
-- Ram
next prev parent reply other threads:[~2011-08-18 20:06 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-14 8:33 [PATCH v2 0/7] Generalized sequencer foundations Ramkumar Ramachandra
2011-08-14 8:33 ` [PATCH 1/7] revert: Free memory after get_message call Ramkumar Ramachandra
2011-08-14 16:15 ` Jonathan Nieder
2011-08-14 8:33 ` [PATCH 2/7] revert: Fix buffer overflow in insn sheet parser Ramkumar Ramachandra
2011-08-14 11:58 ` Jonathan Nieder
2011-08-14 14:07 ` Ramkumar Ramachandra
2011-08-14 8:33 ` [PATCH 3/7] revert: Make commit descriptions in insn sheet optional Ramkumar Ramachandra
2011-08-14 16:09 ` Jonathan Nieder
2011-08-14 16:21 ` Ramkumar Ramachandra
2011-08-14 8:33 ` [PATCH 4/7] revert: Allow mixed pick and revert instructions Ramkumar Ramachandra
2011-08-14 12:12 ` Jonathan Nieder
2011-08-14 14:06 ` Ramkumar Ramachandra
2011-08-14 14:28 ` Jonathan Nieder
2011-08-14 8:33 ` [PATCH 5/7] revert: Make the argument parser responsible for setup_revisions Ramkumar Ramachandra
2011-08-14 12:52 ` Jonathan Nieder
2011-08-14 13:43 ` Ramkumar Ramachandra
2011-08-14 8:33 ` [PATCH 6/7] sequencer: Expose API to cherry-picking machinery Ramkumar Ramachandra
2011-08-14 13:13 ` Jonathan Nieder
2011-08-14 13:57 ` Ramkumar Ramachandra
2011-08-14 15:22 ` Jonathan Nieder
2011-08-16 17:51 ` Junio C Hamano
2011-08-16 18:16 ` [PATCH v2] revert: plug memory leak in "cherry-pick root commit" codepath Jonathan Nieder
2011-08-16 18:27 ` Jonathan Nieder
2011-08-16 18:31 ` Jeff King
2011-08-16 18:56 ` Jonathan Nieder
2011-08-14 8:33 ` [PATCH 7/7] sequencer: Remove sequencer state after final commit Ramkumar Ramachandra
2011-08-14 16:04 ` Jonathan Nieder
2011-08-14 16:37 ` Ramkumar Ramachandra
2011-08-14 16:48 ` Jonathan Nieder
2011-08-14 21:13 ` Junio C Hamano
2011-08-14 21:32 ` Jonathan Nieder
2011-08-14 22:30 ` Junio C Hamano
2011-08-15 18:55 ` Junio C Hamano
2011-08-17 20:23 ` Ramkumar Ramachandra
2011-08-18 18:51 ` Ramkumar Ramachandra
2011-08-18 19:18 ` Jonathan Nieder
2011-08-18 19:50 ` Ramkumar Ramachandra
2011-08-18 20:05 ` Jonathan Nieder
2011-08-18 20:06 ` Ramkumar Ramachandra [this message]
2011-08-18 20:12 ` Jonathan Nieder
2011-08-18 20:22 ` Junio C Hamano
2011-08-18 20:42 ` Junio C Hamano
2011-08-19 9:08 ` Ramkumar Ramachandra
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALkWK0nV35gNFM2NW-FrwBLnvFzmWDdARZk0Xy6LT8c2UE0fAw@mail.gmail.com \
--to=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).