* Avoid using commands like git-config and instead use "git config".

  In some configurations, only the main git command is in the path.

diff --git a/debian/changelog b/debian/changelog
index 2ecaa5e50bce54835a7181f8531d8d38e2f08c2c..52cdcbe8fa456cd5dc7538cf37df39a2d58f31b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.11) UNRELEASED; urgency=low
+
+  * Avoid using commands like git-config and instead use "git config".
+    In some configurations, only the main git command is in the path.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 30 Oct 2007 16:08:31 -0400
+

 mr (0.10) unstable; urgency=low
 
   * Add a lib file for using unison with mr.
 mr (0.10) unstable; urgency=low
 
   * Add a lib file for using unison with mr.

diff --git a/mr b/mr
index ccc764744b10681e23f569864943069cfda227ed..b8d5835e8a038800d50629ea7daf498c556d5f7c 100755 (executable)
--- a/mr
+++ b/mr
@@ -1136,7 +1136,7 @@ darcs_test = test -d "$MR_REPO"/_darcs
 git_bare_test =
        test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
        test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
 git_bare_test =
        test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
        test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&

-       test "$(GIT_CONFIG="$MR_REPO"/config git-config --get core.bare)" = true
+       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
 
 svn_update = svn update "$@"
 git_update = if [ "$@" ]; then git pull "$@"; else git pull -t origin master; fi


@@ -1182,7 +1182,7 @@ svn_register =
        echo "Registering svn url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
        echo "Registering svn url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 

-       url="$(LANG=C git-config --get remote.origin.url)" || true
+       url="$(LANG=C git config --get remote.origin.url)" || true

        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi


@@ -1212,7 +1212,7 @@ darcs_register =
        echo "Registering darcs repository $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
 git_bare_register = 
        echo "Registering darcs repository $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
 git_bare_register = 

-       url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+       url="$(LANG=C GIT_CONFIG=config git config --get remote.origin.url)" || true

        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi

diff --git a/mrconfig.complex b/mrconfig.complex
index b69830ca7dce72cdf14912cb1cbef669f5dee545..f5d850a17d711368934c5ad041992a2421dacaaf 100644 (file)
--- a/mrconfig.complex
+++ b/mrconfig.complex
@@ -13,7 +13,7 @@ git_gc = git gc "$@"
 git_push = git push "$@"
 git_tag = git tag -l
 svn_tag = svn ls "$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
 git_push = git push "$@"
 git_tag = git tag -l
 svn_tag = svn ls "$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"

-# This hack is here because git-pull stupidly outputs tag info to stderr.
+# This hack is here because git pull stupidly outputs tag info to stderr.

 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true
 # Tests used in the skips below.
 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true
 # Tests used in the skips below.