From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5074 invoked by alias); 24 May 2015 20:31:27 -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: 35282 Received: (qmail 20712 invoked from network); 24 May 2015 20:31:23 -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=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Date: Sun, 24 May 2015 20:24:16 +0000 From: "brian m. carlson" To: zsh-workers@zsh.org Subject: Error messages from VCS_INFO_get_data_git Message-ID: <20150524202415.GD26436@vauxhall.crustytoothpaste.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="MZf7D3rAEoQgPanC" Content-Disposition: inline X-Machine: Running on vauxhall using GNU/Linux on x86_64 (Linux kernel 3.16.0-4-amd64) User-Agent: Mutt/1.5.23 (2014-03-12) --MZf7D3rAEoQgPanC Content-Type: multipart/mixed; boundary="JBi0ZxuS5uaEhkUZ" Content-Disposition: inline --JBi0ZxuS5uaEhkUZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I'm using zsh 5.0.7 and I'm seeing some error messages when I use git rebase -m with vcs_info. One is already fixed in git, and if I copy the git version of the file over my existing copy, I get the following: grep: .git/rebase-merge/git-rebase-todo: No such file or directory I'm using Git 2.4.0, and that file doesn't appear to exist in newer Git versions. I've also tried with Git 2.1.4, and it appears to be absent there as well. The fix is probably as simple as redirecting stderr in that case to /dev/null. A patch to do exactly that is attached. Please CC me, as I'm not subscribed. --=20 brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187 --JBi0ZxuS5uaEhkUZ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=vcs-info-git-patch diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index c348da2..80c6df3 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -210,7 +210,7 @@ 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 '^#')"}) + git_patches_unapplied=(${(f)"$(grep -v '^$' "${patchdir}/git-rebase-todo" 2>/dev/null | grep -v '^#')"}) VCS_INFO_git_handle_patches elif [[ -d "${gitdir}/rebase-apply" ]]; then # Fake patch names for all but current patch --JBi0ZxuS5uaEhkUZ-- --MZf7D3rAEoQgPanC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJVYjNvAAoJEL9TXYEfUvaLK8oQAI7L2dVa9bwKXKxP739WkBoH akPys4UEnfQKxnP2wYd6xbObM5jIcdPu/WGD5Jr8G4NJ0GyedDKezLHYKGE/LAC/ 2ngnkXBgfsX2dPE/odfquMreGydkRibu8U0FRHKlQ/ovqK/wCFGmCqx11turrra6 EIpFJuylelKxET+R0eG2uG9VFxgcEIehaIZY6Ry/OthQAa90M7DbU875ULOiwKht LW0gvkQTn0M07LKuJqeVPlY0omTewkjlwlCNa+srWwges17mvWXlxih8nBT3TOZS 92HR8AofsfXL1KQm2sX4/9dlvzPIvvI4ikEaDoGY8+3ttkn7WUHcQ6BtFdnDx9cm 52sbBYpaj9qiIYogjPkvNS+7isD7gPr/maYyyxndqm4QUEQ3Izj41Da3voNdIzxS uV4CcSMOll7GbnwqJrhPAFaK1JUupwNq9PVyorlbrGgWDdv2fkxQiromhq+Hwq8y S+PeGCCHXZBKZWrTVDvINCLKqgdwrDjH/UrhT/TpNNg9A3zRSNPofizWgAm0Czit mIbKmjOF3wC0hjwx4wPQEOYayB/JiK2Xv159/lNezAFlOi0obejtZwQWNIWcNq4D PYUkmkO4Pae1+SH88qiroxQNQ9wQeYpD70hZRoaHjVw5pnzrOG672+kfTQgK7n/h lds3L5d4BAI8GhRpkdjS =2Owh -----END PGP SIGNATURE----- --MZf7D3rAEoQgPanC--