expand

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

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index b5af791c34efc570005e0b960c6979ff64436ee9..398478e4f47b807f4d7e6debe9202518da5cfa86 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -45,14 +45,15 @@ lib =
 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_DIR="$MR_REPO" git config --get core.bare)" = false
+       test `GIT_DIR="$MR_REPO" git config --get core.worktree`

 
 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_DIR="$MR_REPO" git status "$@" || true
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status -s "$@" || true

 
 git_fake_bare_commit =
        cd "$(git_get_worktree)"
 
 git_fake_bare_commit =
        cd "$(git_get_worktree)"