X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/c00fe8afd2ae2e21fca7ad8408e674ae4f300d54..974251824556a96bd670d48c2ffcf4c0a9c12426:/mr

diff --git a/mr b/mr
index 33bde35..412209d 100755
--- a/mr
+++ b/mr
@@ -1183,12 +1183,7 @@ 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
-	fi
+git_update = git pull "$@"
 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
@@ -1243,7 +1238,7 @@ git_register =
 	echo "Registering git url: $url in $MR_CONFIG"
 	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
-	url=`cat .bzr/branch/parent`
+	url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"
 	if [ -z "$url" ]; then
 		error "cannot determine bzr url"
 	fi