From: Joey Hess <joey@kitenet.net>
Date: Thu, 13 Dec 2007 02:29:16 +0000 (-0500)
Subject: * Updating git repos no longer uses git-pull -t by default. Git makes it
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/c45104b555bcabaa5571d5d9af45cbcae4b369eb?ds=inline

* Updating git repos no longer uses git-pull -t by default. Git makes it
  to much of a PITA to do this, since -t makes git-pull require the
  repository and refspec be specified at the command line (which is a bug in
  git (#456035). mr used to hardcode those to "origin" and "master", but
  that's not always the right choice. So give up on forcing git to be sane
  about pulling down all tags. It's insane. Live with it, or configure your
  own update command.
---

diff --git a/debian/changelog b/debian/changelog
index 47a4867..002db28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 mr (0.19) UNRELEASED; urgency=low
 
   * Support versions of man that don't use -l.
+  * Updating git repos no longer uses git-pull -t by default. Git makes it
+    to much of a PITA to do this, since -t makes git-pull require the
+    repository and refspec be specified at the command line (which is a bug in
+    git (#456035). mr used to hardcode those to "origin" and "master", but
+    that's not always the right choice. So give up on forcing git to be sane
+    about pulling down all tags. It's insane. Live with it, or configure your
+    own update command.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 04 Dec 2007 15:13:26 -0500
 
diff --git a/debian/control b/debian/control
index 7f21b19..9f05c0d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: mr
 Section: utils
-Priority: optional
+Priority: optionalaaa
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.2
diff --git a/mr b/mr
index f4a93b6..079af52 100755
--- a/mr
+++ b/mr
@@ -1166,7 +1166,12 @@ git_bare_test =
 	test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
 
 svn_update = svn update "$@"
-git_update = if [ "$@" ]; then git pull "$@"; else git pull -t origin master; fi
+git_update =
+	if [ "$@" ]; then
+		git pull "$@"
+	else
+		git pull
+	fi
 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"