factor out extracting the worktree to a function

[code/myrepos.git] / lib / git-fake-bare

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 0c33934275028542eabb05fb0785e9a24d74112e..3ffcccc45b1f483109fb89232c6f8dd5c37d6238 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -28,6 +28,18 @@ lib =
                mv .git/* .
                rmdir .git
        }
                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 &&
 
 git_fake_bare_test = 
        test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&


@@ -54,14 +66,7 @@ git_fake_bare_register =
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        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'"
        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'"