From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Git List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 13/18] revert: Introduce --reset to remove sequencer state
Date: Mon, 1 Aug 2011 23:22:01 +0530 [thread overview]
Message-ID: <CALkWK0n+=wWBhhMHuxXj9Stz0fVT9Gy1V9EMh+nX9vmH6ngT3Q@mail.gmail.com> (raw)
In-Reply-To: <201107311601.43472.chriscool@tuxfamily.org>
Hi Christian,
Christian Couder writes:
> On Thursday 28 July 2011 18:52:26 Ramkumar Ramachandra wrote:
>> @@ -765,17 +784,21 @@ static int pick_revisions(struct replay_opts *opts)
>>
>> read_and_refresh_cache(opts);
>>
>> - walk_revs_populate_todo(&todo_list, opts);
>> - create_seq_dir();
>> - if (get_sha1("HEAD", sha1)) {
>> - if (opts->action == REVERT)
>> - die(_("Can't revert as initial commit"));
>> - die(_("Can't cherry-pick into empty head"));
>> - } else
>> + if (opts->subcommand == REPLAY_RESET) {
>> + remove_sequencer_state(1);
>> + return 0;
>> + } else {
>
> Maybe you could remove this "else" so that the indentation level is reduced.
This was intentional, mainly for stylistic reasons. See [1].
>> + /* Start a new cherry-pick/ revert sequence */
>> + walk_revs_populate_todo(&todo_list, opts);
>> + create_seq_dir();
>> + if (get_sha1("HEAD", sha1)) {
>> + if (opts->action == REVERT)
>> + die(_("Can't revert as initial commit"));
>> + die(_("Can't cherry-pick into empty head"));
>> + }
>> save_head(sha1_to_hex(sha1));
>> - save_opts(opts);
>> - save_todo(todo_list, opts);
>
> It looks like this save_todo() was not necessary in the first place because
> pick_commits() does a save_todo() before processing each commit.
Fixed in the earlier patch. Thanks!
[1]: http://thread.gmane.org/gmane.comp.version-control.git/177960
Thanks.
-- Ram
next prev parent reply other threads:[~2011-08-01 17:52 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 16:52 [PATCH 00/18] Sequencer for inclusion v4 Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-28 17:35 ` Jonathan Nieder
2011-07-28 20:15 ` Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 06/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 07/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 08/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 09/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 10/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-07-28 17:45 ` Jonathan Nieder
2011-07-28 20:18 ` Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 11/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-07-31 11:42 ` Christian Couder
2011-08-01 17:55 ` Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 12/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-07-31 12:08 ` Christian Couder
2011-07-31 20:52 ` Christian Couder
2011-08-01 17:23 ` Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 13/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-07-31 14:01 ` Christian Couder
2011-08-01 17:52 ` Ramkumar Ramachandra [this message]
2011-07-28 16:52 ` [PATCH 14/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 15/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 16/18] revert: Don't implictly stomp pending sequencer operation Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 17/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-31 15:51 ` Christian Couder
2011-08-01 17:48 ` Ramkumar Ramachandra
2011-08-03 13:34 ` Jonathan Nieder
2011-08-03 17:30 ` Junio C Hamano
2011-08-03 17:59 ` Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 18/18] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-28 17:00 ` [PATCH 00/18] Sequencer for inclusion v4 Ramkumar Ramachandra
-- strict thread matches above, loose matches on Subject: below --
2011-08-01 18:06 [PATCH v5 00/18] Sequencer for inclusion Ramkumar Ramachandra
2011-08-01 18:07 ` [PATCH 13/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-08-04 10:38 [PATCH 00/18] Sequencer for inclusion v6 Ramkumar Ramachandra
2011-08-04 10:39 ` [PATCH 13/18] revert: Introduce --reset to remove sequencer state 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='CALkWK0n+=wWBhhMHuxXj9Stz0fVT9Gy1V9EMh+nX9vmH6ngT3Q@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).