mason.git: fix parsing of "git status" command

--porcelain option produces machine readable output. Then if the output
is empty, the working tree is clean. The exit code doesn't need to be
checked.

diff --git a/extra/mason/git/git.factor b/extra/mason/git/git.factor
index 66220e374204f815c79b0643812557c64e5fcc24..8f4d03a5641be633def15e2707fd065e01a87e3c 100644 (file)
--- a/extra/mason/git/git.factor
+++ b/extra/mason/git/git.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators.short-circuit continuations
-debugger io io.directories io.directories.hierarchy
-io.encodings.utf8 io.files io.launcher io.sockets
-io.streams.string kernel mason.common mason.email sequences
+USING: accessors continuations debugger io io.directories
+io.directories.hierarchy io.encodings.utf8 io.files io.launcher
+io.sockets io.streams.string kernel mason.common mason.email sequences
 splitting ;
 IN: mason.git
 
@@ -55,19 +54,10 @@ IN: mason.git
     ] [ rethrow ] if ;
 
 : git-status-cmd ( -- cmd )
-    { "git" "status" } ;
-
-: git-status-failed ( error -- )
-    ! Exit code 1 means there's nothing to commit.
-    dup { [ process-failed? ] [ code>> 1 = ] } 1&&
-    [ drop ] [ rethrow ] if ;
+    { "git" "status" "--porcelain" } ;
 
 : git-status ( -- seq )
-    [
-        git-status-cmd utf8 [ lines ] with-process-reader*
-        { 0 1 } member? [ drop ] [ process-failed ] if
-        [ "#\t" head? ] filter
-    ] [ git-status-failed { } ] recover ;
+    git-status-cmd utf8 [ lines ] with-process-reader ;
 
 : check-repository ( -- seq )
     "factor" [ git-status ] with-directory ;