From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH] vcs_info git: Present merge heads as patches
Date: Thu, 3 Sep 2015 09:24:16 +0000 [thread overview]
Message-ID: <20150903092416.GA11852@tarsus.local2> (raw)
This shows, during 'git merge', the revision hashes of the "remote" head
(the one that will become second parent of the commit) in the %m expando.
---
Doc/Zsh/contrib.yo | 2 +-
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index db0940d..741d4ad 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -1339,7 +1339,7 @@ tt(formats) and tt(actionformats) and will be available in the global
tt(backend_misc) array as tt(${backend_misc[bookmarks]}).
)
item(tt(gen-applied-string))(
-Called in the tt(git) (with tt(stgit) or during rebase), and tt(hg)
+Called in the tt(git) (with tt(stgit) or during rebase or merge), and tt(hg)
(with tt(mq)) backends and in tt(quilt) support when the tt(applied-string)
is generated; the tt(use-quilt) zstyle must be true for tt(quilt) (the tt(mq)
and tt(stgit) backends are active by default).
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 3fc861e..5c136d6 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -231,6 +231,23 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
git_patches_unapplied=($(seq $cur $(< "${patchdir}/last")))
VCS_INFO_git_handle_patches
+elif [[ -f "${gitdir}/MERGE_HEAD" ]]; then
+ # This is 'git merge --no-commit'
+ local -a heads=( ${(@f)"$(<"${gitdir}/MERGE_HEAD")"} )
+ local subject;
+ IFS='' read -r subject < "${gitdir}/MERGE_MSG"
+ # $subject is the subject line of the would-be commit
+ # Maybe we can get the subject lines of MERGE_HEAD's commits cheaply?
+
+ local p
+ for p in $heads[@]; do
+ git_patches_applied+=("$p $subject")
+ done
+ unset p
+
+ # Not touching git_patches_unapplied
+
+ VCS_INFO_git_handle_patches
else
gitmisc=''
fi
--
2.1.4
reply other threads:[~2015-09-03 9:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150903092416.GA11852@tarsus.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).