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

PATCH: VCS_INFO_get_data_git: add support for showing the action is cherry-pick

X-seq: zsh-workers 30639
From: Mikael Magnusson <mikachu@xxxxxxxxx>
To: zsh-workers@xxxxxxx
Subject: PATCH: VCS_INFO_get_data_git: add support for showing the action is cherry-pick
Date: Thu, 23 Aug 2012 15:35:43 +0200
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=gIF0B9EGNH5+WVaxgFNwQey0bFmDrUHkAsqx/ewk4zw=; b=poLekvU4HEbndpWk9ZywSAxwq/8hmtLQrnCgYPyNuQ4j63UNzRWw9yZ1Aq81ZrZqUG EvTjD/PO1eJFElg9fO38dUic+xk3CXQrEMHLrEVwwTZK0cVJNDVa2P8+MS6+Hb0dqsqJ Q5bi/VVi97+GBlsR8PRT619vjLv808lslgXz9S84GHsdQ0hBA5zc7pS2xOLtfeVYpta2 QTcjS4NFZK5iRFM7cRBW2+o5yL0FA2OR8t8Yxn5mwMh8DJZ6daX1M1yuFAl3eCoxDgV/ cLHLeDUB2la4JPU4nBL5/Dt23btHuS36ItP5+7mx5icMo88hR1qzK3/ZJW5MH3QEq1xI 8GTQ==
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

---
 Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 9364fd0..e3f84a1 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -52,6 +52,17 @@ VCS_INFO_git_getaction () {
         printf '%s' "bisect"
         return 0
     fi
+
+    if [[ -f "${gitdir}/CHERRY_PICK_HEAD" ]] ; then
+        if [[ -d "${gitdir}/sequencer" ]] ; then
+            gitaction=cherry-seq
+        else
+            gitaction=cherry
+        fi
+        printf '%s' ${gitaction}
+        return 0
+    fi
+
     return 1
 }
 
-- 
1.7.10.GIT

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