]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Use short mode status output for git and bzr.
authorJoey Hess <joey@kitenet.net>
Thu, 17 Jun 2010 17:19:12 +0000 (13:19 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Jun 2010 17:19:12 +0000 (13:19 -0400)
debian/changelog
lib/git-fake-bare
lib/git-svn
mr

index 82b249327b1e8753a4083cc0d3ffdc9e84031fd4..7ee67e5befd5ba55c120f0738b8b4b9d5a57bd26 100644 (file)
@@ -1,6 +1,7 @@
 mr (0.49) UNRELEASED; urgency=low
 
   * Update suggests for git-core to git transition.
 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
 
 
  -- Joey Hess <joeyh@debian.org>  Thu, 08 Apr 2010 16:06:46 -0400
 
index 786a8d7c498c66b43623833ce9653f8ee03a6440..b90304d42b9898341669f3a2f938351f72d98250 100644 (file)
@@ -53,7 +53,7 @@ git_fake_bare_update =
        [ -z "$args" ] && args="-t origin $branch"
        GIT_DIR="$MR_REPO" git pull $args
 
        [ -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)"
 
 git_fake_bare_commit =
        cd "$(git_get_worktree)"
index 7e42b8820e986734ce760f5f79dce5895dd27873..bcdb545e4c7543710dcd72a21dc9dcb78726501c 100644 (file)
@@ -9,7 +9,7 @@
 # configure that as follows in your ~/.mrconfig:
 #git_svn_update = git svn rebase
 git_svn_update = git svn fetch
 # 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 "$@"
 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 4fe0c614246adbeb6ae4af324e16a3ee0e9ca9a2..10cfa154db1c08506676f068929a225377e7b95d 100755 (executable)
--- a/mr
+++ b/mr
@@ -1573,8 +1573,8 @@ hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
 
 svn_status = svn status "$@"
 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
 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"
 darcs_status = darcs whatsnew -ls "$@" || true