X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/c43f9d1f483b45907f24e6befc68016d3ed9ac93..40e3d94eed1a9bef9da8d02170a9d9f09d91620b:/lib/git-fake-bare diff --git a/lib/git-fake-bare b/lib/git-fake-bare index 6c8bddd..786a8d7 100644 --- a/lib/git-fake-bare +++ b/lib/git-fake-bare @@ -16,7 +16,6 @@ lib = # git doesn't have an easy way to check out such a repo, so # do it by hand git_fake_bare_checkout() { - set -x local url; url="$1" local repo; repo="$2" local worktree; worktree="$3" @@ -29,7 +28,6 @@ lib = 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" - set +x } git_get_worktree() { local worktree @@ -51,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 @@ -61,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 "$@"