X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/42e5ed9236d5417f5827df3648e72f8e7ffe5b95..15777c43598bbd99578adc2f7404561ce20735d8:/lib/git-fake-bare?ds=sidebyside

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 231b631..33bd39e 100644
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -10,25 +10,21 @@
 
 # And an example repo using it would look something like:
 #[.dotfiles]
-#lib = git_fake_bare_worktree $HOME
-#checkout = git_fake_bare_checkout git://... .dotfiles
+#checkout = git_fake_bare_checkout git://... .dotfiles <worktree, eg. ..>
 
 lib =
-	# called to tell git where the worktree is
-	git_fake_bare_worktree() {
-		GIT_WORK_TREE="$1"; export GIT_WORK_TREE
-	}
 	# git doesn't have an easy way to check out such a repo, so
 	# do it by hand
 	git_fake_bare_checkout() {
 		url="$1"
 		repo="$2"
-		GIT_WORK_TREE= git clone --no-checkout "$url" "$repo"
+		worktree="$3"
+		git clone --no-checkout "$url" "$repo"
 		cd "$repo"
-		mkdir -p "$GIT_WORK_TREE"
+		mkdir -p "$worktree"
 		git read-tree HEAD
-		git config core.worktree "$GIT_WORK_TREE"
 		git checkout-index -a --prefix="$worktree" || true
+		git config core.worktree "$worktree"
 		mv .git/* .
 		rmdir .git
 	}
@@ -39,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
 
@@ -57,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
@@ -69,6 +60,8 @@ git_fake_bare_register =
 	if [ ! -d "$worktree" ]; then
 		error "git worktree $worktree does not exist"
 	fi
-	mr -c "$MR_CONFIG" config "`pwd`" lib="git_fake_bare_worktree '$worktree'"
 	echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)"
-	mr -c "$MR_CONFIG" config "`pwd`" checkout="git_fake_bare_checkout '$url' '$MR_REPO'"
+	mr -c "$MR_CONFIG" config "`pwd`" \
+		checkout="git_fake_bare_checkout '$url' '$MR_REPO' '$worktree'"
+
+# vim:sw=8:sts=0:ts=8:noet