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

Remove trailing slash from MR_REPO.
[code/myrepos.git] / lib / git-fake-bare
index 786a8d7c498c66b43623833ce9653f8ee03a6440..7a04fa6f609fb61e7e6fa745bf2b0c4aefccc8aa 100644 (file)
@@ -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
@@ -45,15 +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="$@"
-       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
 
-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)"