[PATCH] vcs_info: avoid grep error message when file is missing

[PATCH] vcs_info: avoid grep error message when file is missing

[brian m. carlson]

When running git rebase -m and a conflict occurs, the git-rebase-todo
file is not present.  This leads to an error from grep every time the
shell prompt is printed when vcs_info is enabled.  Avoid this message by
checking if the file exists before trying to grep it.
---
Please CC me, as I'm not subscribed.

 Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index c348da2..3fc861e 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -210,7 +210,9 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
         # remove action
         git_patches_applied+=("${${(s: :)p}[2,-1]}")
     done
-    git_patches_unapplied=(${(f)"$(grep -v '^$' "${patchdir}/git-rebase-todo" | grep -v '^#')"})
+    if [[ -f "${patchdir}/git-rebase-todo" ]] ; then
+        git_patches_unapplied=(${(f)"$(grep -v '^$' "${patchdir}/git-rebase-todo" | grep -v '^#')"})
+    fi
     VCS_INFO_git_handle_patches
 elif [[ -d "${gitdir}/rebase-apply" ]]; then
     # Fake patch names for all but current patch
-- 
2.5.0.276.gf5e568e

Re: [PATCH] vcs_info: avoid grep error message when file is missing

[Frank Terbeck]

Hi!

brian m. carlson wrote:
> When running git rebase -m and a conflict occurs, the git-rebase-todo
> file is not present.  This leads to an error from grep every time the
> shell prompt is printed when vcs_info is enabled.  Avoid this message by
> checking if the file exists before trying to grep it.

Thanks, I've just pushed this to the central repository.


Regards, Frank