From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Tue, 23 Jul 2013 23:29:04 +0000 (+0200)
Subject: Merge branch 'feature--vcsh-status'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/fa9c745105d377d950b089fdbd3b11e234f635a1?hp=30dbb0ffb2c3dfaedd4c38d8444f093cd28af7c8

Merge branch 'feature--vcsh-status'
---

diff --git a/changelog b/changelog
index c835962..0dd7c3f 100644
--- 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 e7fdb94..3c72ef8 100644
--- 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 bcf114d..9532e65 100644
--- 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 b88fd97..98c2bab 100755
--- 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