From: Jonathan Nieder <jrnieder@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 16/18] revert: Remove sequencer state when no commits are pending
Date: Wed, 27 Jul 2011 16:10:06 +0200 [thread overview]
Message-ID: <20110727141006.GA24785@elie> (raw)
In-Reply-To: <CALkWK0noPtLgr_t=DC_XFdLrWUNCLhUd00Mw1HbmWRJjeT4jew@mail.gmail.com>
Ramkumar Ramachandra wrote:
> Sounds nice in theory, but how do we do it? Remove the state at "git
> commit" time? I've already thought about the problem and presented my
> arguments here [1].
>
> [1]: http://article.gmane.org/gmane.comp.version-control.git/177465
For reference:
> My sequencer state was blown away just because of a stray
> .git/remove-sequencer-state-after-commit from a previous operation!
> This is horrible. One can then argue: the file should only ever abort
> *that* sequencer operation, and now we run into the problem of
> assigning a UID for each sequencer operation. Unnatural and ugly.
> Conclusion: Making "git commit" remove the sequencer state is WRONG.
That is a compelling argument for not using a
.git/remove-sequencer-state-after-commit file, but I don't see why one
would want such a file anyway. Why can't "git commit" just call a
function or use a command that examines .git/sequencer and looks at
how many commits are left to pick?
Looking at it from the other side, "My sequencer state was blown away"
is a bit dramatic. If it's a problem in "git commit", why isn't it a
problem in "git reset", too? If I just commited after resolving a
conflict from applying the last commit in the series, what cherry-pick
sequence state is going to be useful to me now?
And how is this any less unnatural than making the 'abort cherry-pick'
facility unusable when and only when cherry-picking the last commit in
a sequence? I don't get it.
next prev parent reply other threads:[~2011-07-27 14:10 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 3:18 [PATCH 00/18] GSoC update: Sequencer for inclusion v3 Ramkumar Ramachandra
2011-07-27 3:18 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-27 3:18 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-27 3:39 ` Jonathan Nieder
2011-07-27 5:42 ` Jeff King
2011-07-28 15:40 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-07-27 4:18 ` Jonathan Nieder
2011-07-27 17:26 ` Ramkumar Ramachandra
2011-07-27 17:42 ` Jonathan Nieder
2011-07-27 17:49 ` Ramkumar Ramachandra
2011-07-27 17:51 ` Jonathan Nieder
2011-07-27 3:19 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-27 4:32 ` Jonathan Nieder
2011-07-28 15:43 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 06/18] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-27 4:39 ` Jonathan Nieder
2011-07-27 9:47 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 07/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-27 4:43 ` Jonathan Nieder
2011-07-27 8:59 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 08/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 09/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 10/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-27 4:46 ` Jonathan Nieder
2011-07-31 12:31 ` Christian Couder
2011-08-01 17:37 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 11/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-07-27 5:02 ` Jonathan Nieder
2011-07-27 10:19 ` Ramkumar Ramachandra
2011-07-27 15:56 ` Jonathan Nieder
2011-07-27 18:03 ` Ramkumar Ramachandra
2011-07-27 22:51 ` Junio C Hamano
2011-07-27 3:19 ` [PATCH 12/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-07-27 5:05 ` Jonathan Nieder
2011-07-27 9:51 ` Ramkumar Ramachandra
2011-07-27 14:21 ` Jonathan Nieder
2011-07-27 15:49 ` Ramkumar Ramachandra
2011-07-27 22:51 ` Junio C Hamano
2011-07-27 3:19 ` [PATCH 13/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 14/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-07-27 5:11 ` Jonathan Nieder
2011-07-27 10:12 ` Ramkumar Ramachandra
2011-07-27 14:28 ` Jonathan Nieder
2011-07-27 14:35 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 15/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-07-27 5:16 ` Jonathan Nieder
2011-07-28 15:42 ` Ramkumar Ramachandra
2011-07-28 15:59 ` Jonathan Nieder
2011-07-27 3:19 ` [PATCH 16/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-07-27 5:17 ` Jonathan Nieder
2011-07-27 9:42 ` Ramkumar Ramachandra
2011-07-27 14:10 ` Jonathan Nieder [this message]
2011-07-27 14:30 ` Ramkumar Ramachandra
2011-07-27 15:48 ` Jonathan Nieder
2011-07-27 15:52 ` Ramkumar Ramachandra
2011-07-28 16:16 ` Ramkumar Ramachandra
2011-07-29 19:16 ` Jonathan Nieder
2011-07-29 19:56 ` Ramkumar Ramachandra
2011-07-30 13:10 ` Jonathan Nieder
2011-07-30 14:43 ` Ramkumar Ramachandra
2011-07-30 14:48 ` Jonathan Nieder
2011-07-27 3:19 ` [PATCH 17/18] revert: Don't implictly stomp pending sequencer operation Ramkumar Ramachandra
2011-07-27 5:19 ` Jonathan Nieder
2011-07-27 9:59 ` Ramkumar Ramachandra
2011-07-27 14:33 ` Jonathan Nieder
2011-07-27 17:06 ` Ramkumar Ramachandra
2011-07-27 3:19 ` [PATCH 18/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-27 5:22 ` Jonathan Nieder
2011-07-27 9:36 ` Ramkumar Ramachandra
2011-07-27 15:42 ` Jonathan Nieder
2011-07-27 15:56 ` Ramkumar Ramachandra
2011-07-27 22:52 ` Junio C Hamano
2011-07-28 13:16 ` Ramkumar Ramachandra
2011-07-27 22:59 ` [PATCH 00/18] GSoC update: Sequencer for inclusion v3 Junio C Hamano
2011-07-28 16:26 ` Ramkumar Ramachandra
2011-07-28 16:32 ` Ramkumar Ramachandra
2011-07-28 16:39 ` Jonathan Nieder
-- strict thread matches above, loose matches on Subject: below --
2011-07-19 17:17 [GSoC update] Sequencer for inclusion v2 Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 16/18] revert: Remove sequencer state when no commits are pending 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=20110727141006.GA24785@elie \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).