git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Andrew Wong <andrew.kw.w@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed
Date: Mon, 19 Mar 2012 09:51:22 -0700	[thread overview]
Message-ID: <7vk42gbkl1.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1332106632-31882-1-git-send-email-andrew.kw.w@gmail.com> (Andrew Wong's message of "Sun, 18 Mar 2012 17:37:12 -0400")

Andrew Wong <andrew.kw.w@gmail.com> writes:

> For example, the sequencer current doesn't clean up CHERRY_PICK_HEAD if
> 'commit' failed due to an empty commit. Letting 'rebase -i' deal with
> removing CHERRY_PICK_HEAD keeps the sequencer's logic a bit cleaner.

Hmmm.

Isn't the real solution *not* to create the CHERRY_PICK_HEAD in the
sequencer when it is not know if it is needed, instead of the current code
which seems to create first and then selectively try to unlink() it?

  reply	other threads:[~2012-03-19 16:51 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-31 22:56 Rebase regression in v1.7.9? Felipe Contreras
2012-02-01 17:27 ` Andrew Wong
2012-02-01 19:30   ` Felipe Contreras
2012-03-18 21:37 ` [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed Andrew Wong
2012-03-19 16:51   ` Junio C Hamano [this message]
2012-03-19 21:00     ` Andrew Wong
2012-03-24 20:03       ` Andrew Wong
2012-04-02 22:38         ` Andrew Wong
2012-04-02 23:08           ` Junio C Hamano
2012-04-03  5:15             ` Junio C Hamano
2012-04-03  6:32   ` Ramkumar Ramachandra
2012-04-03 14:45     ` Jonathan Nieder
2012-04-03 21:01       ` Andrew Wong
2012-04-03 21:08         ` Jonathan Nieder
2012-04-03 21:12           ` Jonathan Nieder
2012-04-03 21:22             ` Andrew Wong
2012-04-03 21:26               ` Jonathan Nieder
2012-04-03 23:11                 ` Andrew Wong
2012-04-04 18:11                   ` Jonathan Nieder
2012-04-04 19:23                     ` Andrew Wong
2012-04-04 20:16                       ` Jonathan Nieder
2012-04-04 20:20                         ` Jonathan Nieder

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=7vk42gbkl1.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=andrew.kw.w@gmail.com \
    --cc=git@vger.kernel.org \
    /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).