From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Jun 2010 17:19:12 +0000 (-0400)
Subject: Use short mode status output for git and bzr.
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/d332d3a592f8b3b84b85d518d5febc9f8d06fe70

Use short mode status output for git and bzr.
---

diff --git a/debian/changelog b/debian/changelog
index 82b2493..7ee67e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mr (0.49) UNRELEASED; urgency=low
 
   * Update suggests for git-core to git transition.
+  * Use short mode status output for git and bzr.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 08 Apr 2010 16:06:46 -0400
 
diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 786a8d7..b90304d 100644
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -53,7 +53,7 @@ git_fake_bare_update =
 	[ -z "$args" ] && args="-t origin $branch"
 	GIT_DIR="$MR_REPO" git pull $args
 
-git_fake_bare_status = GIT_DIR="$MR_REPO" git status "$@" || true
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status -s "$@" || true
 
 git_fake_bare_commit =
 	cd "$(git_get_worktree)"
diff --git a/lib/git-svn b/lib/git-svn
index 7e42b88..bcdb545 100644
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -9,7 +9,7 @@
 # configure that as follows in your ~/.mrconfig:
 #git_svn_update = git svn rebase
 git_svn_update = git svn fetch
-git_svn_status = git status "$@" || true
+git_svn_status = git status -s "$@" || true
 git_svn_commit = git svn dcommit
 git_svn_push = git svn dcommit
 git_svn_record = git commit -a "$@"
diff --git a/mr b/mr
index 4fe0c61..10cfa15 100755
--- a/mr
+++ b/mr
@@ -1573,8 +1573,8 @@ hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
 
 svn_status = svn status "$@"
-git_status = git status "$@" || true
-bzr_status = bzr status "$@"
+git_status = git status -s "$@" || true
+bzr_status = bzr status --short "$@"
 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"
 darcs_status = darcs whatsnew -ls "$@" || true