fix

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

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index b90304d42b9898341669f3a2f938351f72d98250..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


@@ -42,14 +42,14 @@ 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_DIR="$MR_REPO" 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="$@"

-       branch="$(GIT_DIR="$MR_REPO" git symbolic-ref HEAD | sed -re 's,.+/,,')"
+       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
 
        [ -z "$args" ] && args="-t origin $branch"
        GIT_DIR="$MR_REPO" git pull $args