X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/5005b07da4ab98791af3b27d66ea18917d5dc901..42d4edaa0085600180aa529a65a65ea0e20f35d0:/lib/git-fake-bare diff --git a/lib/git-fake-bare b/lib/git-fake-bare index 0c33934..341b369 100644 --- a/lib/git-fake-bare +++ b/lib/git-fake-bare @@ -28,6 +28,18 @@ 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 && @@ -37,15 +49,22 @@ git_fake_bare_test = 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 "$@" @@ -54,14 +73,7 @@ git_fake_bare_register = 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'"