dev-tex/vc: Fix parsing of git status output.

Package-Manager: portage-2.2.23

3 files changed, 31 insertions, 1 deletions

diff --git a/dev-tex/vc/ChangeLog b/dev-tex/vc/ChangeLog
index 954383a..6c25e10 100644
--- a/dev-tex/vc/ChangeLog
+++ b/dev-tex/vc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vc-0.5-r1 (05 Nov 2015)
+
+  05 Nov 2015; Ulrich Müller <ulm@gentoo.org> -vc-0.5.ebuild,
+  +vc-0.5-r1.ebuild, +files/vc-0.5-git-status.patch:
+  Fix parsing of git status output.
+
   15 May 2015; Ulrich Müller <ulm@gentoo.org> vc-0.5.ebuild,
   +files/vc-0.5-fix-git-date.patch:
   Fix date information in git.
diff --git a/dev-tex/vc/files/vc-0.5-git-status.patch b/dev-tex/vc/files/vc-0.5-git-status.patch
new file mode 100644
index 0000000..e67007d
--- /dev/null
+++ b/dev-tex/vc/files/vc-0.5-git-status.patch
@@ -0,0 +1,23 @@
+--- vc-orig/git-unix/vc
++++ vc/git-unix/vc
+@@ -20,5 +20,5 @@
+ git --no-pager log -1 HEAD --pretty=format:"Hash: %H%nAbr. Hash: %h%nParent Hashes: %P%nAbr. Parent Hashes: %p%nAuthor Name: %an%nAuthor Email: %ae%nAuthor Date: %ai%nCommitter Name: %cn%nCommitter Email: %ce%nCommitter Date: %ci%n" |gawk -v script=log -v full=$full -f vc-git.awk > vc.tex
+ if [ "$mod" = 1 ]
+ then
+-  git status |gawk -v script=status -f vc-git.awk >> vc.tex
++  git status --porcelain |gawk -v script=status -f vc-git.awk >> vc.tex
+ fi
+--- vc-orig/git-unix/vc-git.awk
++++ vc/git-unix/vc-git.awk
+@@ -26,9 +26,9 @@
+ 
+ ### Process output of "git status".
+ ### Changed index?
+-script=="status" && /^# Changes to be committed:/ { modified = 1 }
++script=="status" && /^[MADRC]/ { if (modified == 0) modified = 1 }
+ ### Unstaged modifications?
+-script=="status" && /^# Changed but not updated:/ { modified = 2 }
++script=="status" && /^.[MD]/ { modified = 2 }
+ 
+ 
+ 
diff --git a/dev-tex/vc/vc-0.5.ebuild b/dev-tex/vc/vc-0.5-r1.ebuild
index 278d9c9..88adcda 100644
--- a/dev-tex/vc/vc-0.5.ebuild
+++ b/dev-tex/vc/vc-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -20,6 +20,7 @@ S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix-git-date.patch
+	epatch "${FILESDIR}"/${P}-git-status.patch
 }
 
 src_compile() { :; }