Fixed more newer/older git issues

ivanwills · Mar 28, 2016 · 52aaf4e · 52aaf4e
1 parent 09dabcd
commit 52aaf4e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/VCS/Which/Plugin/Git.pm b/lib/VCS/Which/Plugin/Git.pm
@@ -271,14 +271,22 @@ sub status {
         else {
             $untracked =~ s/^[#].*?\n//gxms;
         }
-        $status{untracked} = [ grep {$_} map {chomp; $_} split /\n?[#]?\s+/, $untracked ];
+
+        if ($untracked =~ /^[#]/xms) {
+            $status{untracked} = [ grep {$_} map {chomp; $_} split /\n?[#]\s+/, $untracked ];
+        }
+        else {
+            $status{untracked} = [ $untracked =~ /^\t(.*?)\n/gxms ];
+        }
     }
 
-    $status{merge} = $status =~ /
+    if ($status =~ /
         You \s+ have \s+ unmerged \s+ paths[.]$
         |
         All \s+ conflicts \s+ fixed \s+ but \s+ you \s+ are \s+ still \s+ merging[.]$
-    /xms;
+    /xms) {
+        $status{merge} = 1;
+    }
 
     return \%status;
 }