Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits
- X-seq: zsh-workers 33147
- From: Marc Finet <m.dreadlock@xxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits
- Date: Fri, 12 Sep 2014 23:30:37 +0200
- Cc: Marc Finet <m.dreadlock@xxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lqmGfG+Dl7zc5dEiP3tWkmVfOrQ1PPyosrRbxEPW01o=; b=JkkKD83kSdap7lg+GPR2PFxZcRukx1jvVl9EqkgkATiCIecck0ngwCf5t07AqFC1dy z/ADXYyeK2i+BRfz6m6bzpx5YT7Ffru2HukBuT5pRe9/gz6jBM+tBHTKonxDHxKRT0Ce VPCwiUMw2BU6umRpJe98Im9GB7+WkhLT/Ei8yY69DNChcadFN8yZx3dmq/ImRsUkPj/M AOp9GyK4JJuM4EFbjzAwkMVQaBJ+VpsHHI2qdsrmqQNPTKGQ+TkV4GsNYMHSJa8aGcwR VJBUsqvGW871zsn+ZIbHyDiADrB1qPCaclGBYjtTCXQcHzwpPDj47qBVz6rbcbE95SYX dNKQ==
- In-reply-to: <1410557443-24178-1-git-send-email-m.dreadlock@gmail.com>
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
- References: <1410557443-24178-1-git-send-email-m.dreadlock@gmail.com>
When revert or cherry-pick involve many commits the .git/sequencer
directory holds context for the action and no CHERRY_PICK_HEAD exist.
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 76ab92f..263a325 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -62,6 +62,11 @@ VCS_INFO_git_getaction () {
return 0
fi
+ if [[ -d "${gitdir}/sequencer" ]] ; then
+ gitaction="cherry-or-revert"
+ return 0
+ fi
+
return 1
}
--
2.1.0
Messages sorted by:
Reverse Date,
Date,
Thread,
Author