From c45104b555bcabaa5571d5d9af45cbcae4b369eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Dec 2007 21:29:16 -0500 Subject: [PATCH 1/1] * 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. --- debian/changelog | 7 +++++++ debian/control | 2 +- mr | 7 ++++++- 3 files changed, 14 insertions(+), 2 deletions(-) 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 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 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 "$@" -- 2.39.2