From: Jonathan Nieder <jrnieder@gmail.com>
To: Ramkumar Ramachandra <artagnon@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: Sun, 14 Aug 2011 11:48:19 -0500 [thread overview]
Message-ID: <20110814164819.GA12747@elie.gateway.2wire.net> (raw)
In-Reply-To: <CALkWK0m0KyZkOqVWJET=_Xy5GxwVfpPkB0OO1b2hJ8aN_x7hGA@mail.gmail.com>
Ramkumar Ramachandra wrote:
> Putting an "int aggressive = 1" and passing the variable instead of
> the literal is a little inelegant.
What about a flag word, like for example read_sha1_file_extended()
takes?
[...]
>> Do you think there might
>> be scripts out there relying on being able to use "git read-tree
>> --reset -u HEAD" to clear away a failed cherry-pick before trying
>> again, and if so, can we do something about it?
>
> I'm not sure we can do anything about it -- we should probably put
> some kind of warning in the commit message?
That's necessary at a minimum.
I actually _don't_ think there might be many scripts relying on "git
read-tree --reset -u HEAD" to clear away a failed cherry-pick, simply
because very few people seem to use plumbing these days :) and those
who do might be of a mindset to use "git apply" instead of
cherry-pick. But it would be prudent to run a code search to check
and to think carefully about the effect on people who did use the
"read-tree --reset && cherry-pick again" idiom.
Hope that helps.
Jonathan
next prev parent reply other threads:[~2011-08-14 16:48 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 [this message]
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
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=20110814164819.GA12747@elie.gateway.2wire.net \
--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).