Re: [PATCH] vcs_info: Silence an error message with new git versions

[Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>]

Frank Terbeck wrote:
>  Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 34 +++++++++++++++--------
>  1 file changed, 22 insertions(+), 12 deletions(-)

The diff looks a bit large: The reason is that the portion of the code
used tabs for indentation, which is done nowhere in the rest of
vcs_info. I called "M-x untabify" on it before making my changes to the
code. Ignoring the whitespace changes, the diff looks like this:


diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 8ecc7c7..dcff616 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -224,11 +224,21 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
         for p in $(seq $(($cur - 1))); do
             git_patches_applied+=("$(printf "%04d" $p) ?")
         done
+        if [[ -f "${patchdir}/msg-clean" ]]; then
             subject="${$(< "${patchdir}/msg-clean")[(f)1]}"
+        fi
         if [[ -f "${patchdir}/original-commit" ]]; then
+            if [[ -n $subject ]]; then
                 git_patches_applied+=("$(< ${patchdir}/original-commit) $subject")
             else
+                git_patches_applied+=("$(< ${patchdir}/original-commit)")
+            fi
+        else
+            if [[ -n $subject ]]; then
                 git_patches_applied+=("? $subject")
+            else
+                git_patches_applied+=("?")
+            fi
         fi
         git_patches_unapplied=($(seq $cur $(< "${patchdir}/last")))
     fi