X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/28ba04630a336adaf29c1e3206473d7848b5ac13..5e352846b9d840bf9370f7b5ea9052c82b07f2c6:/vcsh?ds=inline

diff --git a/vcsh b/vcsh
index 1d38101..0a9e52d 100755
--- a/vcsh
+++ b/vcsh
@@ -23,13 +23,13 @@ help() {
           <newname>     Rename repository
    run <repo> \\
        <command>        Use this repository
-
-   seed-gitignore \\
-   <repo>               Seed .gitignore.d/<repo> from git ls-files
    setup                Set up repository with recommended settings
+   write-gitignore \\
+   <repo>               Write .gitignore.d/<repo> via git ls-files
 
    <repo> <git command> Special command that allows you to run git commands
                         directly without having to type so much ;)" >&2
+   <repo>               Special command that enters a repository
 }
 
 debug() {
@@ -141,7 +141,21 @@ run() {
 	$VCSH_EXTERNAL_COMMAND
 }
 
-seed_gitignore() {
+setup() {
+	use
+	git config core.worktree     "$GIT_WORK_TREE"
+	git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
+	git config vcsh.vcsh         'true'
+	[ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME"
+}
+
+use() {
+	git_dir_exists
+	export GIT_WORK_TREE="$(git config --get core.worktree)"
+	export VCSH_DIRECTORY="$VCSH_REPO_NAME"
+}
+
+write_gitignore() {
 	use
 	cd "$HOME" || fatal "could not enter '$HOME'" 11
 	gitignores=$(for file in $(git ls-files); do
@@ -170,20 +184,6 @@ seed_gitignore() {
 		fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53
 }
 
-setup() {
-	use
-	git config core.worktree     "$GIT_WORK_TREE"
-	git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
-	git config vcsh.vcsh         'true'
-	[ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME"
-}
-
-use() {
-	git_dir_exists
-	export GIT_WORK_TREE="$(git config --get core.worktree)"
-	export VCSH_DIRECTORY="$VCSH_REPO_NAME"
-}
-
 if [ "$1" = 'clone' ]; then
 	[ -z $2 ] && fatal "$1: please specify a remote" 1
 	export VCSH_COMMAND="$1"
@@ -197,8 +197,8 @@ elif [ "$1" = 'delete' ] ||
      [ "$1" = 'list-tracked-by' ] ||
      [ "$1" = 'rename' ] ||
      [ "$1" = 'run' ] ||
-     [ "$1" = 'seed-gitignore' ] ||
-     [ "$1" = 'setup' ]; then
+     [ "$1" = 'setup' ] ||
+     [ "$1" = 'write-gitignore' ]; then
 	[ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
 	[ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1
 	[ "$1" = 'run' -a -z "$3" ]    && fatal "$1: please specify a command" 1
@@ -207,7 +207,7 @@ elif [ "$1" = 'delete' ] ||
 	export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
 	[ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
 	[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
-	[ "$VCSH_COMMAND" = 'seed-gitignore' ]
+	[ "$VCSH_COMMAND" = 'write-gitignore' ]
 elif [ "$1" = 'list' ] ||
      [ "$1" = 'list-tracked' ]; then
 	export VCSH_COMMAND="$1"