]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

some fixes to bare and fake-bare registering
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 3dbacf0437ac6a4039b3db29ef499b27a310e402..80b423f4e3c982f542742b88f6c4a3eb3cb5e778 100755 (executable)
--- a/mr
+++ b/mr
@@ -1159,8 +1159,6 @@ git_bare_register =
        if [ -z "$url" ]; then
                error "cannot determine git url"
        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"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare $url $MR_REPO"
 git_fake_bare_register = 
@@ -1169,6 +1167,9 @@ git_fake_bare_register =
                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"
@@ -1177,13 +1178,14 @@ git_fake_bare_register =
                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 --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"
+       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