X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/4fcd993763e3df3e77d6b86bbd514f417d0a5bcd..118446a2c8a0a53ac46e5f3ab1ea9b4b5088ee86:/lib/git-fake-bare?ds=sidebyside diff --git a/lib/git-fake-bare b/lib/git-fake-bare index 140d24d..341b369 100644 --- a/lib/git-fake-bare +++ b/lib/git-fake-bare @@ -28,40 +28,52 @@ lib = mv .git/* . rmdir .git } + git_get_worktree() { + local worktree + worktree="$(git config --get core.worktree)" || true + if [ -z "$worktree" ]; then + error "git worktree is not set" + fi + worktree="${worktree%%/}/" + if [ ! -d "$worktree" ]; then + error "git worktree $worktree does not exist" + fi + 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_CONFIG="$MR_REPO"/config git-config --get core.bare)" = false + test "$(GIT_CONFIG="$MR_REPO"/config git config --get core.bare)" = false git_fake_bare_update = args="$@" [ -z "$args" ] && args="-t origin master" - eval GIT_DIR="$MR_REPO" git pull "$args" + GIT_DIR="$MR_REPO" git pull $args git_fake_bare_status = git status "$@" || true -git_fake_bare_commit = error "commit does not work for fake bare git repositories (yet)." +git_fake_bare_commit = + cd "$(git_get_worktree)" + GIT_DIR="$MR_REPO" git commit -a "$@" + GIT_DIR="$MR_REPO" git push --all -git_fake_bare_record = error "record does not work for fake bare git repositories (yet)." +git_fake_bare_record = + cd "$(git_get_worktree)" + GIT_DIR="$MR_REPO" git commit -a "$@" -git_fake_bare_diff = error "diff does not work for fake bare git repositories (yet)." +git_fake_bare_diff = + cd "$(git_get_worktree)" + GIT_DIR="$MR_REPO" git diff "$@" git_fake_bare_log = git log "$@" git_fake_bare_register = - url="$(LC_ALL=C GIT_CONFIG=config git-config --get remote.origin.url)" || true + url="$(LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url)" || true if [ -z "$url" ]; then error "cannot determine git url" fi - worktree="$(git-config --get core.worktree)" || true - if [ -z "$worktree" ]; then - error "git worktree is not set" - fi - worktree="${worktree%%/}/" - if [ ! -d "$worktree" ]; then - error "git worktree $worktree does not exist" - fi + worktree="$(git_get_worktree)" echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)" mr -c "$MR_CONFIG" config "`pwd`" \ checkout="git_fake_bare_checkout '$url' '$MR_REPO' '$worktree'"