Always ensure all parent .mrconfig files are loaded

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

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 13b2f1004255bb5f6d1cf1f19610f44ab208ab3c..5091d95ea4f29894016dd3abf6ff10bd0b19927c 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -1,4 +1,4 @@
-# An example of how to add a new revision control system type to mr.
+# An example of how to add a new version 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
 # ones $HOME, but checked into different git repositories. This file adds
 # git fake bare repositories have a detached workspace. One potential
 # application is storing dotfiles in git, keeping them checked out in
 # ones $HOME, but checked into different git repositories. This file adds


@@ -22,11 +22,12 @@ lib =
                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`"

                mv .git/* .
                rmdir .git
                mv .git/* .
                rmdir .git

+               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"

        }
        git_get_worktree() {
                local worktree
        }
        git_get_worktree() {
                local worktree


@@ -41,23 +42,27 @@ lib =
                echo "$worktree"
        }
 
                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
+git_fake_bare_test = perl:
+       -d "$ENV{MR_REPO}/refs/heads" && -d "$ENV{MR_REPO}/refs/tags" &&
+       -d "$ENV{MR_REPO}/objects" && -f "$ENV{MR_REPO}/config" &&
+       `GIT_DIR="$ENV{MR_REPO}" git config --get core.worktree` ne ""

 
 git_fake_bare_update =
        args="$@"
 
 git_fake_bare_update =
        args="$@"

-       [ -z "$args" ] && args="-t origin master"
+       branch="$(GIT_DIR="$MR_REPO" git symbolic-ref HEAD | sed -e 's,.*/,,')"
+       [ -z "$args" ] && args="-t origin $branch"

        GIT_DIR="$MR_REPO" git pull $args
 
        GIT_DIR="$MR_REPO" git pull $args
 

-git_fake_bare_status = git status "$@" || true
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status -s "$@" || 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 =
        cd "$(git_get_worktree)"
        GIT_DIR="$MR_REPO" git commit -a "$@"
        GIT_DIR="$MR_REPO" git push --all
 

+git_fake_bare_push =
+       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_record = 
        cd "$(git_get_worktree)"
        GIT_DIR="$MR_REPO" git commit -a "$@"


@@ -66,7 +71,7 @@ git_fake_bare_diff =
        cd "$(git_get_worktree)"
        GIT_DIR="$MR_REPO" git 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 = 
        url="$(LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url)" || true
 
 git_fake_bare_register = 
        url="$(LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url)" || true