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 33bd39eac2fb414bd08c333c20f59d71c1bfa467..3ffcccc45b1f483109fb89232c6f8dd5c37d6238 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -1,7 +1,7 @@
 # An example of how to add a new revision control system type to mr.
 # git fake bare repositories have a detached workspace. One potential
 # application is storing dotfiles in git, keeping them checked out in
 # An example of how to add a new revision control system type to mr.
 # 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
+# ones $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]
 # support for them, separate from the normal git support.
 
 # To make mr use this file, add a line like this inside the [DEFAULT]


@@ -28,11 +28,23 @@ 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 &&
        test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
 
 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="$@"
 
 git_fake_bare_update =
        args="$@"


@@ -43,23 +55,18 @@ git_fake_bare_status = git status "$@" || true
 
 git_fake_bare_commit = error "commit does not work for fake bare git repositories (yet)."
 
 
 git_fake_bare_commit = error "commit does not work for fake bare git repositories (yet)."
 

+git_fake_bare_record = error "record does not work for fake bare git repositories (yet)."
+

 git_fake_bare_diff = error "diff does not work for fake bare git repositories (yet)."
 
 git_fake_bare_log = git log "$@"
 
 git_fake_bare_register = 
 git_fake_bare_diff = error "diff does not work for fake bare git repositories (yet)."
 
 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
        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'"