Merge branch 'feature--vcsh-status'

diff --git a/changelog b/changelog
index c835962e1bc7345b85f3de5ab8287ea979a73aef..0dd7c3f0314956acda80f724461390dfcf16f36a 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,17 @@
+2013-07-23  Richard Hartmann <richih.mailinglist@gmail.com>
+
+       * Release 1.20130723
+       * Support $VCSH_GITIGNORE == none
+       * Documentation improvements,
+       * Improved zsh completion
+       * Add support for `vcsh pull`
+       * Add support for `vcsh push`
+       * Add retire() to tear down vcsh ENV
+       * Add clone hooks, including one witout vcsh ENV to
+         allow subsequent cloning of other repos
+       * Fix `vcsh rename`
+       * Improve general code robustness
+
 2013-06-14  Richard Hartmann <richih.mailinglist@gmail.com>
 
        * Release 1.20130614

diff --git a/doc/hooks b/doc/hooks
index e7fdb94024ca32e88e952b7ca2232893e25956b0..3c72ef88e336f6eb8f109a6871aa7f2068eee469 100644 (file)
--- a/doc/hooks
+++ b/doc/hooks
@@ -20,3 +20,6 @@ Available hooks are:
 * post-run
 * pre-upgrade
 * post-upgrade
+
+If you write any interesting or useful hooks, please send them upstream
+so they can be included in an examples section.

diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index bcf114d4f5197a5ffab37a959f110874fd3a43dc..9532e654278c1187eb0112b8d50769ed19156eea 100644 (file)
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -169,16 +169,16 @@ executed in the context of your shell.
 Interesting knobs you can turn:
 
 * <$VCSH_GITIGNORE>:
-  Can be <exact>, <recursive>, or <none>.
+  Can be <exact>, <none>, or <recursive>.
 
   <exact> will seed the repo-specific ignore file with all file and directory
   names which `git ls-files` returns.
 
+  <none> will not write any ignore file.
+
   <recursive> will descend through all directories recursively additionally to
   the above.
 
-  <none> will not write any ignore file.
-
   Defaults to <exact>.
 
 Less interesting knobs you could turn:

diff --git a/vcsh b/vcsh
index b88fd97325ae89cde0b3b1eb332f75d03d5bd77f..98c2babd40daa24604da900bd3203e7cddefd128 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -8,7 +8,7 @@
 # While the following is not legally binding, the author would like to
 # explain the choice of GPLv2+ over GPLv3+.
 # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain
-# full compatibility's with git. In case git ever changes its licensing terms,
+# full compatibility's with Git. In case Git ever changes its licensing terms,
 # which is admittedly extremely unlikely to the point of being impossible,
 # this software will most likely follow suit.
 
@@ -24,7 +24,7 @@ basename() {
 }
 
 SELF=$(basename $0)
-VERSION='1.20130614'
+VERSION='1.20130723'
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
@@ -234,6 +234,7 @@ pull() {
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git pull
+               echo
        done
        hook post-pull
 }
@@ -245,6 +246,7 @@ push() {
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git push
+               echo
        done
        hook post-push
 }
@@ -345,8 +347,8 @@ write_gitignore() {
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
 }
 
-if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ]; then
-       fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'recursive', or 'none'" 1
+if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
+       fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1
 fi
 
 if [ "$1" = 'clone' ]; then