From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH 1/3] vcs_info git: Reformat to minimise next diff. No functional change.
Date: Tue, 2 Oct 2018 15:20:52 +0000 [thread overview]
Message-ID: <20181002152054.28358-1-danielsh@tarpaulin.shahaf.local2> (raw)
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index c3e62db3a..af7466be5 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -190,8 +190,19 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
# pick/edit/fixup/squash/reword: Add "$hash $subject" to $git_patches_applied.
# exec: Add "exec ${command}" to $git_patches_applied.
# (anything else): As 'exec'.
- p=${p/(#s)(p|pick|e|edit|r|reword|f|fixup|s|squash) /}
- p=${p/(#s)x /exec }
+ case $p in
+ ((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.
+ p=${p#* }
+ ;;
+ (x *)
+ # The line is of the form 'exec foo bar baz' where 'foo bar
+ # baz' is a shell command. There's no way to map _that_ to
+ # "$hash $subject", but I hope this counts as making an effort.
+ p=${p/x /exec }
+ ;;
+ esac
git_patches_applied+=("$p")
done
if [[ -f "${patchdir}/git-rebase-todo" ]] ; then
next reply other threads:[~2018-10-02 15:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 15:20 Daniel Shahaf [this message]
2018-10-02 15:20 ` [PATCH 2/3] vcs_info git: Make sure applied-patches is of the form "$hash $subject" --- that is, has a space and a non-empty second argument --- even with future 'git rebase -i' verbs Daniel Shahaf
2018-10-02 15:20 ` [PATCH 3/3] vcs_info git: In 'git rebase -i', when computing subjects of applied-patches, handle an edge case where the subject is not available 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=20181002152054.28358-1-danielsh@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--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).