diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2018-10-02 Daniel Shahaf <d.s@daniel.shahaf.name> + * unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + Indicate which use-case each branch handles. + * unposted: Doc/Zsh/contrib.yo: Fix typo 2018-09-30 Daniel Shahaf <d.s@daniel.shahaf.name> diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index c3e62db3a..05de4ae84 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -183,6 +183,7 @@ then git_patches_unapplied=(${(f)"$(< "${patchdir}/unapplied")"}) VCS_INFO_git_handle_patches elif [[ -d "${gitdir}/rebase-merge" ]]; then + # 'git rebase -i' patchdir="${gitdir}/rebase-merge" local p [[ -f "${patchdir}/done" ]] && @@ -199,12 +200,13 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then fi VCS_INFO_git_handle_patches elif [[ -d "${gitdir}/rebase-apply" ]]; then - # Fake patch names for all but current patch + # 'git rebase' without -i patchdir="${gitdir}/rebase-apply" local next="${patchdir}/next" if [[ -f $next ]]; then local cur=$(< $next) local p subject + # Fake patch names for all but current patch for ((p = 1; p < cur; p++)); do printf -v "git_patches_applied[$p]" "%04d ?" "$p" done |