From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 26 Oct 2007 07:40:54 +0000 (-0400)
Subject: Merge branch 'master' of git://git.madduck.net/code/mr
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/6976c4433469d551a6be890659d59ab8418f897b?hp=e05cc48761397eb15f7c2b8954cbc54a13c633f3

Merge branch 'master' of git://git.madduck.net/code/mr
---

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index ab9fb12..8afb84a 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