From: Phil Pennock <zsh-workers+phil.pennock@spodhuis.org>
To: Frank Terbeck <ft@bewatermyfriend.org>
Cc: Marc Finet <m.dreadlock@gmail.com>, zsh-workers@zsh.org
Subject: Re: [PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits
Date: Mon, 15 Sep 2014 06:22:35 +0000 [thread overview]
Message-ID: <20140915062235.GA3758@tower.spodhuis.org> (raw)
In-Reply-To: <87tx4a7ddm.fsf@ft.bewatermyfriend.org>
On 2014-09-14 at 11:36 +0200, Frank Terbeck wrote:
> Marc Finet wrote:
> > When revert or cherry-pick involve many commits the .git/sequencer
> > directory holds context for the action and no CHERRY_PICK_HEAD exist.
>
> Hm. I've never hit that situation. I suppose it's correct. You wouldn't
> happen to have a documentation reference to this one?
There are regression tests in t/t3507-cherry-pick-conflict.sh inside the
Git tree which show the situations in which the CHERRY_PICK_HEAD must or
must not exist.
Looks like options such as `--strategy=resolve` will inhibit the
creation of that file.
http://git-scm.com/docs/git-cherry-pick
----------------------------8< cut here >8------------------------------
SEQUENCER SUBCOMMANDS
--continue
Continue the operation in progress using the information in
.git/sequencer. Can be used to continue after resolving conflicts in a
failed cherry-pick or revert.
----------------------------8< cut here >8------------------------------
That's not proof that .git/sequencer can hold information even when
CHERRY_PICK_HEAD exists, but it's suggestive.
It _looks_ as though, if you are cherry-picking multiple commits in one
invocation, then .git/sequencer will exist; during the processing of
each commit in turn, CHERRY_PICK_HEAD will usually be created, then
removed iff that cherry-pick was successful.
-Phil
next prev parent reply other threads:[~2014-09-15 6:39 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 21:30 Misc patches for git completion and vcs_info Marc Finet
2014-09-12 21:30 ` [PATCH 1/9] vcs_info examples: fix typo Marc Finet
2014-09-14 9:33 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 2/9] completion git: support aliases when \n exist Marc Finet
2014-09-12 21:30 ` [PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits Marc Finet
2014-09-14 9:36 ` Frank Terbeck
2014-09-15 6:22 ` Phil Pennock [this message]
2014-09-12 21:30 ` [PATCH 4/9] vcs_info git: set rrn before using it Marc Finet
2014-09-14 9:33 ` Frank Terbeck
2014-09-16 20:07 ` Marc Finet
2014-09-16 20:41 ` Frank Terbeck
2014-09-16 20:57 ` Marc Finet
2014-09-16 21:23 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 5/9] vcs_info quilt: fix standalone detection Marc Finet
2014-09-14 9:42 ` Frank Terbeck
2014-09-16 20:19 ` Marc Finet
2014-09-12 21:30 ` [PATCH 6/9] vcs_info quilt: fix unapplied detection on sub-directory Marc Finet
2014-09-14 9:47 ` Frank Terbeck
2014-09-16 20:25 ` Marc Finet
2014-10-08 22:36 ` Marc Finet
2014-10-09 16:03 ` Frank Terbeck
2014-10-16 4:59 ` Marc Finet
2014-10-16 8:17 ` Frank Terbeck
2014-11-08 10:46 ` Marc Finet
2014-11-11 10:07 ` Marc Finet
2015-01-02 11:03 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 7/9] vcs_info git: fix applied-string name Marc Finet
2014-09-14 9:49 ` Frank Terbeck
2014-09-12 21:30 ` [PATCH 8/9] vcs_info git: consider patches for rebase Marc Finet
2014-09-14 10:08 ` Frank Terbeck
2014-09-14 10:13 ` Frank Terbeck
2014-09-16 20:07 ` Marc Finet
2014-09-12 21:30 ` [PATCH 9/9] completion git: fix send-email --confirm values Marc Finet
2014-09-14 10:11 ` Frank Terbeck
2014-09-12 23:50 ` Misc patches for git completion and vcs_info Bart Schaefer
2014-09-13 7:35 ` Marc Finet
2014-09-13 12:23 ` Frank Terbeck
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=20140915062235.GA3758@tower.spodhuis.org \
--to=zsh-workers+phil.pennock@spodhuis.org \
--cc=ft@bewatermyfriend.org \
--cc=m.dreadlock@gmail.com \
--cc=zsh-workers@zsh.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://git.vuxu.org/mirror/zsh/
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).