X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/a33917423c99bcf6dc02d939e7956a746aa974ca..c45104b555bcabaa5571d5d9af45cbcae4b369eb:/lib/git-fake-bare

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 545115b..33bd39e 100644
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -35,14 +35,9 @@ git_fake_bare_test =
 	test "$(GIT_CONFIG="$MR_REPO"/config git-config --get core.bare)" = false
 
 git_fake_bare_update =
-	# all this is because of a bug in git-fetch, which requires GIT_DIR set
-	local git_dir_override; git_dir_override=.git
-	case "$(get_git_repo_type "$MR_REPO")" in
-		fake-bare) git_dir_override="$MR_REPO";;
-	esac
 	args="$@"
 	[ -z "$args" ] && args="-t origin master"
-	eval GIT_DIR="$git_dir_override" git pull "$args"
+	eval GIT_DIR="$MR_REPO" git pull "$args"
 
 git_fake_bare_status = git status "$@" || true
 
@@ -53,7 +48,7 @@ git_fake_bare_diff = error "diff does not work for fake bare git repositories (y
 git_fake_bare_log = git log "$@"
 
 git_fake_bare_register = 
-	url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+	url="$(LC_ALL=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
 	if [ -z "$url" ]; then
 		error "cannot determine git url"
 	fi
@@ -66,7 +61,7 @@ git_fake_bare_register =
 		error "git worktree $worktree does not exist"
 	fi
 	echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)"
-	mr -c "$MR_CONFIG" config "$PWD" \
+	mr -c "$MR_CONFIG" config "`pwd`" \
 		checkout="git_fake_bare_checkout '$url' '$MR_REPO' '$worktree'"
 
 # vim:sw=8:sts=0:ts=8:noet