From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 20 Oct 2007 00:52:55 +0000 (-0400)
Subject: * Change mr update to use git pull -t origin master, to make sure new tags
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/2d6f3db853c1575babfacadcee0d46c3c63b976e?ds=inline;hp=b51372df89971475ee443553091e5e09552b0b29

* Change mr update to use git pull -t origin master, to make sure new tags
  are pulled. And since those might not always be the right parameters
  for git pull, any parameters passed to mr update will replace them.
---

diff --git a/debian/changelog b/debian/changelog
index b94dc8b..734ded3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ mr (0.5) UNRELEASED; urgency=low
     it exists, and printing a reminder on update. See the mrconfig file
     for an example.
   * Fix output of "mr config DEFAULT lib".
+  * Change mr update to use git pull -t origin master, to make sure new tags
+    are pulled. And since those might not always be the right parameters
+    for git pull, any parameters passed to mr update will replace them.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 19 Oct 2007 16:14:21 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 19 Oct 2007 20:45:07 -0400
 
 mr (0.4) unstable; urgency=low
 
diff --git a/mr b/mr
index 11e2a7b..cd0dea7 100755
--- a/mr
+++ b/mr
@@ -809,7 +809,11 @@ update =
 	if [ -d "$MR_REPO"/.svn ]; then
 		svn update "$@"
 	elif [ -d "$MR_REPO"/.git ]; then
-		git pull origin master "$@"
+		if [ -z "$@" ]; then
+			git pull -t origin master
+		else
+			git pull "$@"
+		fi
 	elif [ -d "$MR_REPO"/.bzr ]; then
 		bzr merge "$@"
 	elif [ -d "$MR_REPO"/CVS ]; then