From 880579dc1e368bd6111b6f2d4c4449f4d42cd1b3 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 3 Sep 2015 09:24:16 +0000 Subject: 36410: vcs_info git: Present merge heads as patches 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. Review-by: Frank Terbeck --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Functions/VCS_Info/Backends') diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 3fc861eeb..638ea4572 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -230,6 +230,23 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then fi 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='' -- cgit 1.4.1