Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: [PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits

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.


----------------------------8< cut here >8------------------------------
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.


Messages sorted by: Reverse Date, Date, Thread, Author