]> git.madduck.net Git - code/myrepos.git/blobdiff - lib/git-fake-bare

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:

factor out extracting the worktree to a function
[code/myrepos.git] / lib / git-fake-bare
index 140d24d60a0ebddb4f87ad4c6d11527a0e8a3a87..3ffcccc45b1f483109fb89232c6f8dd5c37d6238 100644 (file)
@@ -28,11 +28,23 @@ lib =
                mv .git/* .
                rmdir .git
        }
+       git_get_worktree() {
+               local worktree
+               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"
+               fi
+               echo "$worktree"
+       }
 
 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 &&
-       test "$(GIT_CONFIG="$MR_REPO"/config git-config --get core.bare)" = false
+       test "$(GIT_CONFIG="$MR_REPO"/config git config --get core.bare)" = false
 
 git_fake_bare_update =
        args="$@"
@@ -50,18 +62,11 @@ git_fake_bare_diff = error "diff does not work for fake bare git repositories (y
 git_fake_bare_log = git log "$@"
 
 git_fake_bare_register = 
-       url="$(LC_ALL=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+       url="$(LC_ALL=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
-       if [ -z "$worktree" ]; then
-               error "git worktree is not set"
-       fi
-       worktree="${worktree%%/}/"
-       if [ ! -d "$worktree" ]; then
-               error "git worktree $worktree does not exist"
-       fi
+       worktree="$(git_get_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' '$worktree'"