From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19855 invoked by alias); 12 Sep 2014 21:40:05 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 33147 Received: (qmail 3200 invoked from network); 12 Sep 2014 21:40:04 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 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== X-Received: by 10.180.210.201 with SMTP id mw9mr5723286wic.35.1410557576989; Fri, 12 Sep 2014 14:32:56 -0700 (PDT) From: Marc Finet To: zsh-workers@zsh.org Cc: Marc Finet Subject: [PATCH 3/9] vcs_info git: detect revert or cherry-pick with multiple commits Date: Fri, 12 Sep 2014 23:30:37 +0200 Message-Id: <1410557443-24178-4-git-send-email-m.dreadlock@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1410557443-24178-1-git-send-email-m.dreadlock@gmail.com> 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