From c48fc95e0af492946ee8deb361f9a0cab9ef9dfd Mon Sep 17 00:00:00 2001 From: Colin Hebert Date: Thu, 22 Mar 2012 11:07:51 +0000 Subject: [PATCH] Don't count 'unmerged double-deleted' files as added in git plugin --- plugins/git/functions/git-info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git/functions/git-info b/plugins/git/functions/git-info index 08e8955b..02b2c178 100644 --- a/plugins/git/functions/git-info +++ b/plugins/git/functions/git-info @@ -280,7 +280,7 @@ function git-info() { else # Count: added/deleted/modified/renamed/unmerged/untracked # T (type change) is undocumented, see https://raw.github.com/gitster/git/master/Documentation/RelNotes/1.7.8.2.txt - [[ "$line" == [AMDCT][MD\ ]\ * ]] && (( added++ )) + [[ "$line" == ([AMDCT][M\ ]|[AMCT]D)\ * ]] && (( added++ )) [[ "$line" == [\ MARC]D\ * ]] && (( deleted++ )) [[ "$line" == ?[MT]\ * ]] && (( modified++ )) [[ "$line" == R?\ * ]] && (( renamed++ ))