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

Fix the hours_since function built into mr's shell library to not exit, but return...
[code/myrepos.git] / lib / git-fake-bare
index dffd508b451d14ae3bbad9a99a71b432851d121b..786a8d7c498c66b43623833ce9653f8ee03a6440 100644 (file)
@@ -23,11 +23,11 @@ lib =
                cd "$repo"
                mkdir -p "$worktree"
                PWD="`pwd`"
+               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"
-               mv .git/* .
-               rmdir .git
        }
        git_get_worktree() {
                local worktree
@@ -49,7 +49,8 @@ git_fake_bare_test =
 
 git_fake_bare_update =
        args="$@"
-       [ -z "$args" ] && args="-t origin master"
+       branch="$(GIT_DIR="$MR_REPO" git symbolic-ref HEAD | sed -re 's,.+/,,')"
+       [ -z "$args" ] && args="-t origin $branch"
        GIT_DIR="$MR_REPO" git pull $args
 
 git_fake_bare_status = GIT_DIR="$MR_REPO" git status "$@" || true
@@ -59,6 +60,9 @@ git_fake_bare_commit =
        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 "$@"