zsh-workers
 help / color / mirror / code / Atom feed
From: Daniel Shahaf <danielsh@apache.org>
To: zsh-workers@zsh.org
Subject: [PATCH 1/3] vcs_info git: In interactive rebases, ignore comment lines.
Date: Thu, 12 Mar 2020 18:48:51 +0000	[thread overview]
Message-ID: <20200312184853.21654-1-danielsh@tarpaulin.shahaf.local2> (raw)

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

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 5ddce72a6..a8f49e24a 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -202,6 +202,10 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
         # exec: Add "exec ${command}" to $git_patches_applied.
         # (anything else): As 'exec'.
         case $p in
+            ([#]*)
+                # Comment line.  Skip.
+                continue
+                ;; 
             ((p|pick|e|edit|r|reword|f|fixup|s|squash)' '*)
                 # The line is of the form "pick $hash $subject".
                 # Just strip the verb and we're good to go.

             reply	other threads:[~2020-03-12 18:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12 18:48 Daniel Shahaf [this message]
2020-03-12 18:48 ` [PATCH 2/3] vcs_info git: In interactive rebases, properly support the full form of the "exec" verb Daniel Shahaf
2020-03-12 18:48 ` [PATCH 3/3] vcs_info git: In interactive rebases, process gen-unapplied-string arguments like gen-applied-string arguments are processed Daniel Shahaf

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=20200312184853.21654-1-danielsh@tarpaulin.shahaf.local2 \
    --to=danielsh@apache.org \
    --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).