]> 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:

Get rid of GIT_WORK_TREE
authormartin f. krafft <madduck@madduck.net>
Fri, 26 Oct 2007 06:21:53 +0000 (08:21 +0200)
committermartin f. krafft <madduck@madduck.net>
Fri, 26 Oct 2007 06:24:51 +0000 (08:24 +0200)
Since we store core.worktree on checkout, we can get rid of the variable
and make it all a bit easier in the config file, passing worktree to the
checkout helper function.

lib/git-fake-bare

index f059ff70ae13f9bd636fd7f58ff4a1daece86422..ab9fb12765c7e06c7d4a0f9cfa222cd7bfd1fb46 100644 (file)
 
 # And an example repo using it would look something like:
 #[.dotfiles]
 
 # And an example repo using it would look something like:
 #[.dotfiles]
-#lib = git_fake_bare_worktree $HOME
-#checkout = git_fake_bare_checkout git://... .dotfiles
+#checkout = git_fake_bare_checkout git://... .dotfiles <worktree, eg. ..>
 
 lib =
 
 lib =
-       # called to tell git where the worktree is
-       git_fake_bare_worktree() {
-               GIT_WORK_TREE="$1"; export GIT_WORK_TREE
-       }
        # 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"
        # 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"
-               GIT_WORK_TREE= git clone --no-checkout "$url" "$repo"
+               worktree="$3"
+               git clone --no-checkout "$url" "$repo"
                cd "$repo"
                cd "$repo"
-               mkdir -p "$GIT_WORK_TREE"
+               mkdir -p "$worktree"
                git read-tree HEAD
                git read-tree HEAD
-               git config core.worktree "$GIT_WORK_TREE"
                git checkout-index -a --prefix="$worktree" || true
                git checkout-index -a --prefix="$worktree" || true
+               git config core.worktree "$worktree"
                mv .git/* .
                rmdir .git
        }
                mv .git/* .
                rmdir .git
        }
@@ -69,8 +65,8 @@ git_fake_bare_register =
        if [ ! -d "$worktree" ]; then
                error "git worktree $worktree does not exist"
        fi
        if [ ! -d "$worktree" ]; then
                error "git worktree $worktree does not exist"
        fi
-       mr -c "$MR_CONFIG" config "`pwd`" lib="git_fake_bare_worktree '$worktree'"
        echo "Registering git url: $url in $MR_CONFIG (with worktree $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'"
+       mr -c "$MR_CONFIG" config "`pwd`" \
+               checkout="git_fake_bare_checkout '$url' '$MR_REPO' '$worktree'"
 
 # vim:sw=8:sts=0:ts=8:noet
 
 # vim:sw=8:sts=0:ts=8:noet