Merge branch 'zsh-completion'

diff --git a/PACKAGING b/PACKAGING
index 92c1dd50d0d0bcddad814852b492fc55dd67570e..b93b17cd351536ee710eff0867c575a3dd667c61 100644 (file)
--- a/PACKAGING
+++ b/PACKAGING
@@ -11,15 +11,27 @@ the upstream repository
 
 Ubuntu imports Debian's package automagically.
 
+
 # Mac OS X
 
 Homebrew does not require any packaging information within this repository.
 A separate branch with a statically compiled manpage and release tags is
-provided to ease packaging. The static manpage because Homebrew lacks Ronn;
+provided to ease packaging. The static manpage because Homebrew lacks ronn;
 the tag so github generates tarballs Homebrew can be pointed at.
 
-# Anything else
+
+# Additional notes
+
+## Static manpage
+
+In case you can not build the manpage because you are missing ronn please
+contact the author. The "debian-squeeze" branch carries a quilt patchset with
+a pre-compiled manpage and the "homebrew" one carries a static manpage. If you
+need, or want, to build your packages against a static version in your own
+branch this can be done.
+
+## Other systems
 
 If you are maintaining a package for a different distribution, please get
 in touch so your work can be included in another branch, thus allowing others
-to adapt it to their needs or to improve it.
+to adapt it to their needs or to improve upon it.

diff --git a/vcsh b/vcsh
index 9b1a5588b5b8732c363cb4b4f5235b81fdfbd5e7..d742cf44cae8c27aeeaa1c796954e0b26bb1a437 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -12,6 +12,14 @@
 # which is admittedly extremely unlikely to the point of being impossible,
 # this software will most likely follow suit.
 
+basename() {
+       # Implemented in shell to avoid spawning another process
+       local file
+       file="${1##*/}"
+       [ -z "$2" ] || file="${file%$2}"
+       echo "$file"
+}
+
 SELF=$(basename $0)
 VERSION='1.2'
 
@@ -23,7 +31,7 @@ fatal() {
 # We need to run getops as soon as possible so we catch -d and other
 # options that will modify our behaviour.
 # Commands are handled at the end of this script.
-while getopts  "c:dv" flag; do
+while getopts "c:dv" flag; do
        if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then
                set -vx
                VCSH_DEBUG=1
@@ -171,7 +179,7 @@ git_dir_exists() {
 hook() {
        for hook in $VCSH_HOOK_D/$1* $VCSH_HOOK_D/$VCSH_REPO_NAME.$1*; do
                [ -x "$hook" ] || continue
-               info "executing '$hook'"
+               verbose "executing '$hook'"
                "$hook"
        done
 }
@@ -258,9 +266,9 @@ write_gitignore() {
        tempfile=$(mktemp) || fatal "could not create tempfile" 51
        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
+               echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
                if [ x$VCSH_GITIGNORE = x'recursive' ] && [ -d "$gitignore" ]; then
-                       { echo "$gitignore/*" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }
+                       { echo "$gitignore/*" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }
                fi
        done
        if diff -N "$tempfile" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then