merge in madduck's changes to fix fake-bare worktree checkout

[code/myrepos.git] / mr

diff --git a/mr b/mr
index dc1e2ac13623e8e2352aa99f30a64bd7e16d7de3..3dbacf0437ac6a4039b3db29ef499b27a310e402 100755 (executable)
--- a/mr
+++ b/mr
@@ -1162,20 +1162,28 @@ git_bare_register =
        mr -c "$MR_CONFIG" config "`pwd`" \
                lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
        echo "Registering git url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" \
                lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
        echo "Registering git url: $url in $MR_CONFIG"

-       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone $url $MR_REPO"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare $url $MR_REPO"

 git_fake_bare_register = 
        url="$(LANG=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
 git_fake_bare_register = 
        url="$(LANG=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

+       worktree="${worktree%%/}/"

        if [ ! -d "$worktree" ]; then
                error "git worktree $worktree does not exist"
        fi
        mr -c "$MR_CONFIG" config "`pwd`" \
                lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
        echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)"
        if [ ! -d "$worktree" ]; then
                error "git worktree $worktree does not exist"
        fi
        mr -c "$MR_CONFIG" config "`pwd`" \
                lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
        echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)"

-       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone $url $MR_REPO"
+       mr -c "$MR_CONFIG" config "`pwd`" \
+       checkout="
+       git clone --no-checkout $url $MR_REPO
+       cd $MR_REPO
+       git read-tree HEAD
+       git checkout-index -a --prefix='$work_tree' || true
+       git config core.worktree '$worktree'"
+       mv .git/* . && rmdir .git"

 
 help =
        if [ ! -e "$MR_PATH" ]; then
 
 help =
        if [ ! -e "$MR_PATH" ]; then