From f9952301b2e4ba1c2181beabc02a7e0597358e7b Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Tue, 2 Oct 2018 15:21:53 +0000 Subject: unposted: Indicate which use-case each branch handles. --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Functions/VCS_Info/Backends/VCS_INFO_get_data_git') 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 -- cgit 1.4.1