Add vcsh to Suggests.

[code/myrepos.git] / lib / git-fake-bare

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index eeff5510ff37811e792c372530da666239825b79..5091d95ea4f29894016dd3abf6ff10bd0b19927c 100644 (file)
--- 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
@@ -23,11 +23,11 @@ lib =
                cd "$repo"
                mkdir -p "$worktree"
                PWD="`pwd`"
+               mv .git/* .
+               rmdir .git
                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"
-               mv .git/* .
-               rmdir .git
        }
        git_get_worktree() {
                local worktree
@@ -39,26 +39,30 @@ lib =
                if [ ! -d "$worktree" ]; then
                        error "git worktree $worktree does not exist"
                fi
-                       echo "$worktree"
+               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 "$@"