From: Richard Hartmann Date: Mon, 2 Sep 2013 21:16:03 +0000 (+0200) Subject: Merge remote-tracking branch 'madduck/relative_worktrees' into merge--madduck/relativ... X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/6927829eb87b6abbe8b9cdee346624c73aecb512?hp=--cc Merge remote-tracking branch 'madduck/relative_worktrees' into merge--madduck/relative_worktree --- 6927829eb87b6abbe8b9cdee346624c73aecb512 diff --cc vcsh index 2ec4955,5642b97..60fcd99 --- a/vcsh +++ b/vcsh @@@ -212,14 -196,11 +212,13 @@@ hook() } init() { + hook pre-init [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10 - export GIT_WORK_TREE="$VCSH_BASE" - mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50 - cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11 + mkdir -p "$VCSH_BASE" || fatal "could not create '$VCSH_BASE'" 50 + cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11 git init upgrade + hook post-init } list() { @@@ -293,28 -271,17 +291,33 @@@ run() hook post-run } +status() { + if [ ! "x$VCSH_REPO_NAME" = "x" ]; then + export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" + use + git status --short --untracked-files='no' + else + for VCSH_REPO_NAME in $(list); do + echo "$VCSH_REPO_NAME:" + export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" + use + git status --short --untracked-files='no' + echo + done + fi +} + upgrade() { hook pre-upgrade - use - git config core.worktree "$GIT_WORK_TREE" + # fake-bare repositories are not bare, actually. Set this to false + # because otherwise Git complains "fatal: core.bare and core.worktree + # do not make sense" + git config core.bare false + # in core.worktree, keep a relative reference to the base directory + git config core.worktree $(cd $GIT_DIR && GIT_WORK_TREE="$VCSH_BASE" git rev-parse --show-cdup) [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" git config vcsh.vcsh 'true' + use [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" hook post-upgrade }