Merge remote-tracking branch 'origin/fix--vcsh-rename'

diff --combined vcsh
index ced6909a8f29e73a1184b1a8ba4bbc1e839ea578,c3d90db202277e646d448c7537e0ea7ecd588cbb..9b2d2959ba865a853f0ced572026333f05445f36
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -153,8 -153,6 +153,8 @@@ clone() 
    Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
        git merge origin/master
        hook post-clone
 +      retire
 +      hook post-clone-retired
  }
  
  delete() {
@@@ -248,16 -246,17 +248,22 @@@ push() 
        hook post-push
  }
  
 +retire() {
 +      unset GIT_WORK_TREE
 +      unset VCSH_DIRECTORY
 +}
 +
  rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
        mv -f "$GIT_DIR" "$GIT_DIR_NEW" || fatal "Could not mv '$GIT_DIR' '$GIT_DIR_NEW'" 52
  
+       # Now that the repository has been renamed, we need to fix up its configuration
+       # Overwrite old name..
+       GIT_DIR="$GIT_DIR_NEW"
+       $VCSH_REPO_NAME="$VCSH_REPO_NAME_NEW"
+       # ..and clobber all old configuration
+       upgrade
  }
  
  run() {
@@@ -271,7 -270,7 +277,7 @@@ upgrade() 
        hook pre-upgrade
        use
        git config core.worktree     "$GIT_WORK_TREE"
 -      git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
 +      [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'
        [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"
        hook post-upgrade
@@@ -292,12 -291,6 +298,12 @@@ which() 
  }
  
  write_gitignore() {
 +      # Don't do anything if the user does not want to write gitignore
 +      if [ "x$VCSH_GITIGNORE" = 'xnone' ]; then
 +              info "Not writing gitignore as '\$VCSH_GITIGNORE' is set to 'none'"
 +              exit
 +      fi
 +
        use
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        gitignores=$(for file in $(git ls-files); do
@@@ -311,7 -304,7 +317,7 @@@
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
                echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
 -              if [ x$VCSH_GITIGNORE = x'recursive' ] && [ -d "$gitignore" ]; then
 +              if [ "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ -d "$gitignore" ]; then
                        { echo "$gitignore/*" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }
                fi
        done
@@@ -328,8 -321,8 +334,8 @@@
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
  }
  
 -if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
 -      fatal "'\$VCSH_GITIGNORE' must be either 'exact' or 'recursive'" 1
 +if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ]; then
 +      fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'recursive', or 'none'" 1
  fi
  
  if [ "$1" = 'clone' ]; then
@@@ -361,7 -354,8 +367,8 @@@ elif [ "$1" = 'delete' ]           |
        export VCSH_COMMAND="$1"
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-       [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git"
+       [ "$VCSH_COMMAND" = 'rename' ] && { export VCSH_REPO_NAME_NEW="$3";
+                                           export GIT_DIR_NEW="$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git" }
        [ "$VCSH_COMMAND" = 'run' ]    && shift 2
        [ "$VCSH_COMMAND" = 'write-gitignore' ]
  elif [ "$1" = 'list' ] ||
@@@ -393,8 -387,9 +400,8 @@@ if echo $VCSH_REPO_NAME | grep -q '/'; 
        export VCSH_REPO_NAME=$(basename "$VCSH_REPO_NAME" .git)
  fi
  
 -
 -for check_directory in "$VCSH_REPO_D" "$VCSH_BASE/.gitignore.d"
 -do
 +check_dir() {
 +      check_directory="$1"
        if [ ! -d "$check_directory" ]; then
                if [ -e "$check_directory" ]; then
                        fatal "'$check_directory' exists but is not a directory" 13
@@@ -403,10 -398,7 +410,10 @@@
                        mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
                fi
        fi
 -done
 +}
 +
 +check_dir "$VCSH_REPO_D"
 +[ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d"
  
  verbose "$VCSH_COMMAND begin"
  export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')