* 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 b94dc8bb678caf0a445a43b5fe85fb252c2be1b7..734ded345c87ec6663ba307f14740be7a5602a9c 100644 (file)
--- 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 11e2a7b7f32d22677c73c6dd09789ff448f17091..cd0dea7351f5eb8e941fbd530438d7e4ae0a256f 100755 (executable)
--- 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