update

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

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 140d24d60a0ebddb4f87ad4c6d11527a0e8a3a87..b5af791c34efc570005e0b960c6979ff64436ee9 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -16,52 +16,68 @@ lib =
        # 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"
-               worktree="$3"
+               local url; url="$1"
+               local repo; repo="$2"
+               local worktree; worktree="$3"
                git clone --no-checkout "$url" "$repo"
                cd "$repo"
                mkdir -p "$worktree"
-               git read-tree HEAD
-               git checkout-index -a --prefix="$worktree" || true
-               git config core.worktree "$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"
+       }
+       git_get_worktree() {
+               local worktree
+               worktree="$(git config --get core.worktree)" || true
+               if [ -z "$worktree" ]; then
+                       error "git worktree is not set"
+               fi
+               worktree="${worktree%%/}/"
+               if [ ! -d "$worktree" ]; then
+                       error "git worktree $worktree does not exist"
+               fi
+               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_CONFIG="$MR_REPO"/config git-config --get core.bare)" = false
+       test "$(GIT_DIR="$MR_REPO" git config --get core.bare)" = false
 
 git_fake_bare_update =
        args="$@"
        [ -z "$args" ] && args="-t origin master"
-       eval GIT_DIR="$MR_REPO" git pull "$args"
+       GIT_DIR="$MR_REPO" git pull $args
+
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status "$@" || true
 
-git_fake_bare_status = git status "$@" || 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_commit = error "commit does not work for fake bare git repositories (yet)."
+git_fake_bare_push =
+       GIT_DIR="$MR_REPO" git push --all
 
-git_fake_bare_record = error "record does not work for fake bare git repositories (yet)."
+git_fake_bare_record = 
+       cd "$(git_get_worktree)"
+       GIT_DIR="$MR_REPO" git commit -a "$@"
 
-git_fake_bare_diff = error "diff does not work for fake bare git repositories (yet)."
+git_fake_bare_diff =
+       cd "$(git_get_worktree)"
+       GIT_DIR="$MR_REPO" git diff "$@"
 
-git_fake_bare_log = git log "$@"
+git_fake_bare_log = GIT_DIR="$MR_REPO" git log "$@"
 
 git_fake_bare_register = 
-       url="$(LC_ALL=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
-       worktree="$(git-config --get core.worktree)" || true
-       if [ -z "$worktree" ]; then
-               error "git worktree is not set"
-       fi
-       worktree="${worktree%%/}/"
-       if [ ! -d "$worktree" ]; then
-               error "git worktree $worktree does not exist"
-       fi
+       worktree="$(git_get_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' '$worktree'"