From: Joey Hess Date: Fri, 26 Oct 2007 05:06:20 +0000 (-0400) Subject: fixed git fake bare checkout X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/4d36da3584cb7d5126785a8bf0588268fc3d204d?ds=inline fixed git fake bare checkout Got the order and variables right, which I screwed up before, and added a function to handle the messy checkout --- diff --git a/mrconfig.git-fake-bare b/mrconfig.git-fake-bare index 83f2202..7f3e9db 100644 --- a/mrconfig.git-fake-bare +++ b/mrconfig.git-fake-bare @@ -1,11 +1,30 @@ # An example of how to add a new revision control system type to mr. -# git fake bare repositories have a detached workspace. This file adds +# git fake bare repositories have a detached workspace. One potential +# application is storing dotfiles in git, keeping them checked out in +# one $HOME, but checked into different git repositories. This file adds # support for them, separate from the normal git support. # To make mr use this file, add a line like this inside the [DEFAULT] # section of your ~/.mrconfig #include = cat /path/to/mrconfig.git-fake-bare +lib = + # git doesn't have an easy way to check out such a repo, so + # do it by hand + git_fake_bare_checkout() { + set -x + url="$1" + repo="$2" + worktree="${3%%/}/" + git clone --no-checkout "$url" "$repo" + cd "$repo" + git read-tree HEAD + git config core.worktree "$worktree" + git checkout-index -a --prefix="$worktree" || true + mv .git/* . + rmdir .git + } + 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 && @@ -45,12 +64,4 @@ git_fake_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 (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" + mr -c "$MR_CONFIG" config "`pwd`" checkout="git_fake_bare_checkout '$url' '$MR_REPO' '$worktree'"