* 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 47a4867ff5a7065a108b807f93aee6db51edfb4f..002db285dc36e1462314433394ee9368278ab75a 100644 (file)
--- 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 7f21b19474925b9309b4e649c748ad3860869968..9f05c0dfb06713d2d00ca74ff166b9a59188552b 100644 (file)
--- 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 f4a93b6472b779db3fa8902a180c05de157a699a..079af5273eb5c48fd56247c69f1f03e0aa905be3 100755 (executable)
--- 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 "$@"