]> git.madduck.net Git - code/myrepos.git/commitdiff

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:

Fix fake-bare worktree checkout
authormartin f. krafft <madduck@madduck.net>
Thu, 25 Oct 2007 23:33:28 +0000 (01:33 +0200)
committermartin f. krafft <madduck@madduck.net>
Thu, 25 Oct 2007 23:39:38 +0000 (01:39 +0200)
We have to jump through hoops to check out fake-bare repositories since
the target directory probably already exists. Thus, we cheat by telling
git-clone *not* to checkout and then read-tree and checkout-index
ourselves. We also convert the non-bare repository to a fake bare one by
moving stuff around.

Probably a bit hackish but this is the best I can do for now.

mr

diff --git a/mr b/mr
index f5c37af2b332488aeac1e3c874ee43edc75fd89f..0e14168e10a3d965d7b9054b742b2870e404df17 100755 (executable)
--- a/mr
+++ b/mr
@@ -1104,22 +1104,30 @@ register =
                if [ -z "$url" ]; then
                        error "cannot determine git url"
                fi
                if [ -z "$url" ]; then
                        error "cannot determine git url"
                fi
+               local clone_opts add_cmd work_tree suffix
                case "$repo_type" in
                case "$repo_type" in
-                       bare|fake-bare)
-                               # this seems like a bare repo as it has no
-                               # worktree.
-                               local work_tree
+                       fake-bare)
+                               # this seems like a fake bare repo and needs a worktree
                                work_tree="$(git-config --get core.worktree)" || :
                                work_tree="$(git-config --get core.worktree)" || :
+                               work_tree="${work_tree%%/}/"
                                if [ ! -d "$work_tree" ]; then
                                if [ ! -d "$work_tree" ]; then
-                                       error "git worktree $work_tree does not exist"
+                                       error "git worktree '$work_tree' does not exist"
                                fi
                                fi
+                               clone_opts=" --no-checkout"
+                               add_cmd="$add_cmd && cd $basedir"
+                               add_cmd="$add_cmd && git read-tree HEAD"
+                               add_cmd="$add_cmd && git checkout-index -a --prefix='$work_tree' || :"
+                               add_cmd="$add_cmd; git config core.worktree '$work_tree'"
+                               add_cmd="$add_cmd && mv .git/* . && rmdir .git"
                                suffix=" (with worktree $work_tree)"
                                suffix=" (with worktree $work_tree)"
-                               mr -c "$MR_CONFIG" config "$PWD" \
-                                       lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
+                               ;;
+                       bare)
+                               clone_opts=" --bare"
+                               suffix=" (bare repository)"
                                ;;
                esac
                echo "Registering git url: $url in $MR_CONFIG${suffix:-}"
                                ;;
                esac
                echo "Registering git url: $url in $MR_CONFIG${suffix:-}"
-               mr -c "$MR_CONFIG" config "$PWD" checkout="git clone $url $basedir"
+               mr -c "$MR_CONFIG" config "$PWD" checkout="git clone${clone_opts:-} $url $basedir${add_cmd:-}"
                ;;
        bzr)
                url=$(cat .bzr/branch/parent)
                ;;
        bzr)
                url=$(cat .bzr/branch/parent)