git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Christian Couder <chriscool@tuxfamily.org>,
	Daniel Barkalow <barkalow@iabervon.org>,
	Jeff King <peff@peff.net>
Subject: Re: [GSoC update] Sequencer for inclusion v2
Date: Tue, 19 Jul 2011 11:47:36 -0700	[thread overview]
Message-ID: <7vbowq9kfr.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1311095876-3098-1-git-send-email-artagnon@gmail.com> (Ramkumar Ramachandra's message of "Tue, 19 Jul 2011 22:47:38 +0530")

Ramkumar Ramachandra <artagnon@gmail.com> writes:

>>> +                     if (!cur->next)
>>> +                             /*
>>> +                              * An error was encountered while
>>> +                              * picking the last commit; the
>>> +                              * sequencer state is useless now --
>>> +                              * the user simply needs to resolve
>>> +                              * the conflict and commit
>>> +                              */
>>> +                             remove_sequencer_state();
>>>                       return res;
>>> +             }
>>>       }
>>
>> It may be useless for --continue, but wouldn't --abort need some clue on
>> what you were doing?
> ...
> Conclusion: Making "git commit" remove the sequencer state is WRONG.

Why not choose to not to clean it at all?  Then "rebase --continue" and
its equivalent to cherry-pick, rebase and any sequence command) can (and
have to anyway) notice that there is nothing more to do, remove the state
directory and state "there is nothing more to do".

You could make it even easier to use for people by tweaking "a sequence
state directory for an operation you earlier started still exists" logic
to see if everything is done, but I would say that is icing on the cake.

  parent reply	other threads:[~2011-07-19 18:47 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-19 17:17 [GSoC update] Sequencer for inclusion v2 Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-21 15:35   ` Phil Hord
2011-07-22 22:35     ` Jeff King
2011-07-24 10:23       ` Ramkumar Ramachandra
2011-07-24 18:15       ` Junio C Hamano
2011-07-25 21:17         ` Phil Hord
2011-07-19 17:17 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-19 19:55   ` Jeff King
2011-07-19 20:35     ` Jonathan Nieder
2011-07-19 21:26     ` Junio C Hamano
2011-07-19 21:57       ` Jeff King
2011-07-24 10:17         ` Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 06/18] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 07/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 08/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 09/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 10/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 11/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 12/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 13/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 14/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 15/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 16/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 17/18] revert: Don't implictly stomp pending sequencer operation Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 18/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-19 18:47 ` Junio C Hamano [this message]
2011-07-20  9:02   ` [GSoC update] Sequencer for inclusion v2 Ramkumar Ramachandra
2011-07-19 23:54 ` Junio C Hamano
2011-07-24 10:11   ` Ramkumar Ramachandra
2011-07-24 18:17     ` Junio C Hamano

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=7vbowq9kfr.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=artagnon@gmail.com \
    --cc=barkalow@iabervon.org \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --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.
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).