diff options
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 17 | ||||
| -rw-r--r-- | Functions/Zle/bracketed-paste-magic | 2 | ||||
| -rw-r--r-- | Functions/Zle/url-quote-magic | 2 |
3 files changed, 19 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 3fc861eeb..638ea4572 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 diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic index daf5aec5a..49f4b6620 100644 --- a/Functions/Zle/bracketed-paste-magic +++ b/Functions/Zle/bracketed-paste-magic @@ -1,4 +1,4 @@ -# Starting with zsh-5.0.9, ZLE began to recognize the "bracketed paste" +# Starting with zsh-5.1, ZLE began to recognize the "bracketed paste" # capability of terminal emulators, that is, the sequences $'\e[200~' to # start a paste and $'\e[201~' to indicate the end of the pasted text. # Pastes are handled by the bracketed-paste widget and insert literally diff --git a/Functions/Zle/url-quote-magic b/Functions/Zle/url-quote-magic index 362d15c44..0e49573db 100644 --- a/Functions/Zle/url-quote-magic +++ b/Functions/Zle/url-quote-magic @@ -8,7 +8,7 @@ # autoload -Uz url-quote-magic # zle -N self-insert url-quote-magic -# As of zsh-5.0.9, the following may also be necessary in order to apply +# As of zsh-5.1, the following may also be necessary in order to apply # quoting to copy-pasted URLs: # autload -Uz bracketed-paste-magic # zle -N bracketed-paste bracketed-paste-magic |