X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/eb672cdb05dc0bd6f2b2b1c6b61d2f055abc73c5..fdf182e5e6f55f10da7fccc98861ed596248d7a3:/vcsh?ds=sidebyside diff --git a/vcsh b/vcsh index c1b4874..82a98a1 100755 --- a/vcsh +++ b/vcsh @@ -6,19 +6,19 @@ SELF=$(basename $0) [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" [ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" -for check_directory in "$VCSH_BASE" +for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d" do if [ ! -d "$check_directory" ]; then if [ -e "$check_directory" ]; then echo "$SELF: error: $check_directory exists but is not a directory" >&2 exit 2 else + echo "$SELF: info: attempting to create $check_directory" mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) fi fi done - debug() { [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1" } @@ -42,7 +42,9 @@ help() { init Initialize a new repository clone \\ - [] Clone from an existing repository" >&2 + [] Clone from an existing repository + seed-gitignore \\ + Seed .gitignore.d/ from git ls-files" >&2 } use() { @@ -73,7 +75,8 @@ init() { exit 20) || exit 20 cd "$GIT_WORK_TREE" git init - git config core.worktree "$GIT_WORK_TREE" + git config core.worktree "$GIT_WORK_TREE" + git config core.excludesfile ".gitignore.d/$REPO_NAME" verbose "init() end" } @@ -136,6 +139,7 @@ elif [ "$1" = 'clone' ]; then git remote add origin "$GIT_REMOTE" git config branch.master.remote origin git config branch.master.merge refs/heads/master + git config core.excludesfile ".gitignore.d/$REPO_NAME" git fetch for object in $(git ls-tree -r origin/master | awk '{print $4}'); do [ -e "$object" ] && @@ -152,7 +156,7 @@ elif [ "$1" = 'clone' ]; then elif [ "$1" = 'init' ]; then verbose "init begin" - [ -z $2 ] && help && return 0 + [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0 export REPO_NAME="$2" export GIT_DIR="$VCSH_BASE/$REPO_NAME.git" init @@ -170,6 +174,27 @@ elif [ "$1" = 'init' ]; then # verbose "exit end" # exit 0 +elif [ "$1" = 'seed-gitignore' ]; then + verbose "seed-gitignore begin" + [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0 + use "$2" + git config core.excludesfile ".gitignore.d/$REPO_NAME" + files=$(git ls-files) + gitignores=$(for file in $(git ls-files); do + while true; do + echo $file; new="${file%/*}" + [ "$file" = "$new" ] && break + file="$new" + done; + done | sort -u | sed 's/^/!/') + [ -e .gitignore.d/$2 ] && + echo "$SELF: info: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" && + mv -f .gitignore.d/$2 .gitignore.d/$2.bak + echo '*' > .gitignore.d/$2 + for gitignore in $gitignores; do + echo $gitignore >> .gitignore.d/$2 + done + else verbose "defaulting to calling help()" help