diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-10-02 15:21:53 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-10-02 15:22:06 +0000 |
| commit | f9952301b2e4ba1c2181beabc02a7e0597358e7b (patch) | |
| tree | b0a5b3ba83f162e11826ff6c7f12430fe7f0d8f8 /Functions | |
| parent | 6a5c38626b82d18cad431f69aa21dcc94d1b3181 (diff) | |
| download | zsh-f9952301b2e4ba1c2181beabc02a7e0597358e7b.tar.gz zsh-f9952301b2e4ba1c2181beabc02a7e0597358e7b.tar.xz zsh-f9952301b2e4ba1c2181beabc02a7e0597358e7b.zip | |
unposted: Indicate which use-case each branch handles.
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 |
1 files changed, 3 insertions, 1 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..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 |