releasing version 0.26

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

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index ab9fb12765c7e06c7d4a0f9cfa222cd7bfd1fb46..341b3690e2020f3768acf9f80b9b34272a56b1e4 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
-# 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]
@@ -28,43 +28,52 @@ 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 =
-       # all this is because of a bug in git-fetch, which requires GIT_DIR set
-       local git_dir_override; git_dir_override=.git
-       case "$(get_git_repo_type "$MR_REPO")" in
-               fake-bare) git_dir_override="$MR_REPO";;
-       esac
        args="$@"
        [ -z "$args" ] && args="-t origin master"
-       eval GIT_DIR="$git_dir_override" git pull "$args"
+       GIT_DIR="$MR_REPO" git pull $args
 
 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 =
+       cd "$(git_get_worktree)"
+       GIT_DIR="$MR_REPO" git commit -a "$@"
+       GIT_DIR="$MR_REPO" git push --all
+
+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_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
-       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'"