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

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 6c8bddd..5091d95 100644
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -1,4 +1,4 @@
-# An example of how to add a new revision control system type to mr.
+# An example of how to add a new version control system type to mr.
 # git fake bare repositories have a detached workspace. One potential
 # application is storing dotfiles in git, keeping them checked out in
 # ones $HOME, but checked into different git repositories. This file adds
@@ -16,7 +16,6 @@ lib =
 	# git doesn't have an easy way to check out such a repo, so
 	# do it by hand
 	git_fake_bare_checkout() {
-		set -x
 		local url; url="$1"
 		local repo; repo="$2"
 		local worktree; worktree="$3"
@@ -29,7 +28,6 @@ lib =
 		GIT_DIR="$PWD" git read-tree HEAD
 		GIT_DIR="$PWD" git checkout-index -a --prefix="$worktree" || true
 		GIT_DIR="$PWD" git config core.worktree "$worktree"
-		set +x
 	}
 	git_get_worktree() {
 		local worktree
@@ -44,23 +42,27 @@ lib =
 		echo "$worktree"
 	}
 
-git_fake_bare_test = 
-	test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
-	test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
-	test "$(GIT_DIR="$MR_REPO" git config --get core.bare)" = false
+git_fake_bare_test = perl:
+	-d "$ENV{MR_REPO}/refs/heads" && -d "$ENV{MR_REPO}/refs/tags" &&
+	-d "$ENV{MR_REPO}/objects" && -f "$ENV{MR_REPO}/config" &&
+	`GIT_DIR="$ENV{MR_REPO}" git config --get core.worktree` ne ""
 
 git_fake_bare_update =
 	args="$@"
-	[ -z "$args" ] && args="-t origin master"
+	branch="$(GIT_DIR="$MR_REPO" git symbolic-ref HEAD | sed -e 's,.*/,,')"
+	[ -z "$args" ] && args="-t origin $branch"
 	GIT_DIR="$MR_REPO" git pull $args
 
-git_fake_bare_status = GIT_DIR="$MR_REPO" git status "$@" || true
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status -s "$@" || true
 
 git_fake_bare_commit =
 	cd "$(git_get_worktree)"
 	GIT_DIR="$MR_REPO" git commit -a "$@"
 	GIT_DIR="$MR_REPO" git push --all
 
+git_fake_bare_push =
+	GIT_DIR="$MR_REPO" git push --all
+
 git_fake_bare_record = 
 	cd "$(git_get_worktree)"
 	GIT_DIR="$MR_REPO" git commit -a "$@"