merge madduck's fix to not fail determining git url

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 5794ab00a4141b29484a411f67b46f58c522f169..dc1e2ac13623e8e2352aa99f30a64bd7e16d7de3 100755 (executable)
--- a/mr
+++ b/mr
@@ -1125,7 +1125,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)"
+       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


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

-       url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)"
+       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


@@ -1164,7 +1164,7 @@ git_bare_register =
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone $url $MR_REPO"
 git_fake_bare_register = 
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone $url $MR_REPO"
 git_fake_bare_register = 

-       url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)"
+       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