make sure we move repo into place first before using it

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

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 9c8d84bf8b9470ef4dd7d6f813e9f775f749d6da..6c8bddd075252da87194240d6b4b103c8d0aff99 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -16,17 +16,20 @@ lib =
        # git doesn't have an easy way to check out such a repo, so
        # do it by hand
        git_fake_bare_checkout() {
        # 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"
+               set -x
+               local url; url="$1"
+               local repo; repo="$2"
+               local worktree; worktree="$3"

                git clone --no-checkout "$url" "$repo"
                cd "$repo"
                mkdir -p "$worktree"
                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
                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"
+               set +x

        }
        git_get_worktree() {
                local worktree
        }
        git_get_worktree() {
                local worktree


@@ -44,14 +47,14 @@ lib =
 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 &&
 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"
 
 git_fake_bare_update =
        args="$@"
        [ -z "$args" ] && args="-t origin master"

-       GIT_DIR="$MR_REPO" git pull "$args"
+       GIT_DIR="$MR_REPO" git pull $args

 
 

-git_fake_bare_status = git status "$@" || true
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status "$@" || true

 
 git_fake_bare_commit =
        cd "$(git_get_worktree)"
 
 git_fake_bare_commit =
        cd "$(git_get_worktree)"


@@ -66,7 +69,7 @@ git_fake_bare_diff =
        cd "$(git_get_worktree)"
        GIT_DIR="$MR_REPO" git 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
 
 git_fake_bare_register = 
        url="$(LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url)" || true