From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1924 invoked by alias); 17 Aug 2015 22:45:42 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 36209 Received: (qmail 12257 invoked from network); 17 Aug 2015 22:45:42 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU autolearn=ham autolearn_force=no version=3.4.0 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1439851537; bh=YFiHxbUSQMPGmMf1CpXLJ94knEHjMRWDFQ2zKXZLK6k=; h=From:To:Subject:Date:From; b=t5tkkZsk5MYieDaU/UprevbLWWOt3BThYjZV8z3E6+ZBnOshWL4Jz9wEVTb05FH1i vg9jMXs+qmj5rX6txC4bMgF5uN9ILrzwWcmfuRKrZqTjLw/NUqF5SXXccJTrEHxy9N /9+v4VP7TxY7U377SXhkzsg69k9SauCdOOzmxstyHSND4w/pVtuDyEcWBiYg9sNngk l9VUZhXBb8QMCF8HMVcl6uo6fWOYHvg3q1nlWTZc2/8ZB/7ZUFY7TacTOLcX3txi1w kaC6MR2jTIwpEHfa0j7XRp0BAjRYAjkYoztg2hsYBs09j0YuZ+8DnwQh2TIf7xCRqh zZOoR+iMzJxFn4Ywh2SGwPwZFYjkMLDx2Z5Y1J4SAr6Mp0G1o1BIE4sEqOvVK0dcEZ BBQx4Kr6qHigYDVFFf0QtKv4ueNOP4hnVYc17s02RuwsY3bZnZP97cbV6qKvhzPXeF IutaUm9z83L0a+H8x4sJccCfv4ljGpBGXAe9Ig6dr6dlfT+7e3K From: "brian m. carlson" To: zsh-workers@zsh.org Subject: [PATCH] vcs_info: avoid grep error message when file is missing Date: Mon, 17 Aug 2015 22:45:31 +0000 Message-Id: <1439851531-1005745-1-git-send-email-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.5.0.276.gf5e568e 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