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

fix indentation
[code/myrepos.git] / lib / git-fake-bare
index 8afb84aaa2fadc42b90ac0c15c62d14738c4685b..dffd508b451d14ae3bbad9a99a71b432851d121b 100644 (file)
@@ -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]
@@ -16,50 +16,65 @@ lib =
        # git doesn't have an easy way to check out such a repo, so
        # do it by hand
        git_fake_bare_checkout() {
        # 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"
-               worktree="$3"
+               local url; url="$1"
+               local repo; repo="$2"
+               local worktree; worktree="$3"
                git clone --no-checkout "$url" "$repo"
                cd "$repo"
                mkdir -p "$worktree"
                git clone --no-checkout "$url" "$repo"
                cd "$repo"
                mkdir -p "$worktree"
-               git read-tree HEAD
-               git checkout-index -a --prefix="$worktree" || true
-               git config core.worktree "$worktree"
+               PWD="`pwd`"
+               GIT_DIR="$PWD" git read-tree HEAD
+               GIT_DIR="$PWD" git checkout-index -a --prefix="$worktree" || true
+               GIT_DIR="$PWD" git config core.worktree "$worktree"
                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_DIR="$MR_REPO" git config --get core.bare)" = false
 
 git_fake_bare_update =
        args="$@"
        [ -z "$args" ] && args="-t origin master"
 
 git_fake_bare_update =
        args="$@"
        [ -z "$args" ] && args="-t origin master"
-       eval GIT_DIR="$MR_REPO" git pull "$args"
+       GIT_DIR="$MR_REPO" git pull $args
+
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status "$@" || true
 
 
-git_fake_bare_status = git status "$@" || true
+git_fake_bare_commit =
+       cd "$(git_get_worktree)"
+       GIT_DIR="$MR_REPO" git commit -a "$@"
+       GIT_DIR="$MR_REPO" git push --all
 
 
-git_fake_bare_commit = error "commit does not work for fake bare git repositories (yet)."
+git_fake_bare_record = 
+       cd "$(git_get_worktree)"
+       GIT_DIR="$MR_REPO" git commit -a "$@"
 
 
-git_fake_bare_diff = error "diff does not work for fake bare git repositories (yet)."
+git_fake_bare_diff =
+       cd "$(git_get_worktree)"
+       GIT_DIR="$MR_REPO" git diff "$@"
 
 
-git_fake_bare_log = git log "$@"
+git_fake_bare_log = GIT_DIR="$MR_REPO" git log "$@"
 
 git_fake_bare_register = 
 
 git_fake_bare_register = 
-       url="$(LANG=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'"