]>
git.madduck.net Git - code/vcsh.git/blobdiff - vcsh
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
# This should always be the first line of code to facilitate debugging
[ -n "$VCSH_DEBUG" ] && set -vx
# This should always be the first line of code to facilitate debugging
[ -n "$VCSH_DEBUG" ] && set -vx
-basename() {
- # Implemented in shell to avoid spawning another process
- local file
- file="${1##*/}"
- [ -z "$2" ] || file="${file%$2}"
- echo "$file"
-}
-
-VERSION='1.20130909 .git-HEAD'
+VERSION='1.20131214 .git-HEAD'
fatal() {
echo "$SELF: fatal: $1" >&2
fatal() {
echo "$SELF: fatal: $1" >&2
VCSH_DEBUG=1
echo "debug mode on"
echo "$SELF $VERSION"
VCSH_DEBUG=1
echo "debug mode on"
echo "$SELF $VERSION"
- elif [ "$1" = '-v' ];then
+ elif [ "$1" = '-v' ]; then
VCSH_VERBOSE=1
echo "verbose mode on"
echo "$SELF $VERSION"
VCSH_VERBOSE=1
echo "verbose mode on"
echo "$SELF $VERSION"
- elif [ "$1" = '-c' ];then
+ elif [ "$1" = '-c' ]; then
VCSH_OPTION_CONFIG=$OPTARG
fi
shift 1
VCSH_OPTION_CONFIG=$OPTARG
fi
shift 1
for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
[ -e "$object" ] &&
error "'$object' exists." &&
for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
[ -e "$object" ] &&
error "'$object' exists." &&
done
[ "$VCSH_CONFLICT" = '1' ] &&
fatal "will stop after fetching and not try to merge!
done
[ "$VCSH_CONFLICT" = '1' ] &&
fatal "will stop after fetching and not try to merge!
- Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n " 17
+ Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
git merge origin/master
hook post-clone
retire
git merge origin/master
hook post-clone
retire
pull() {
hook pre-pull
for VCSH_REPO_NAME in $(list); do
pull() {
hook pre-pull
for VCSH_REPO_NAME in $(list); do
- echo -n "$VCSH_REPO_NAME: "
+ printf "$VCSH_REPO_NAME: "
export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
use
git pull
export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
use
git pull
push() {
hook pre-push
for VCSH_REPO_NAME in $(list); do
push() {
hook pre-push
for VCSH_REPO_NAME in $(list); do
- echo -n "$VCSH_REPO_NAME: "
+ printf "$VCSH_REPO_NAME: "
export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
use
git push
export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
use
git push
# Now that the repository has been renamed, we need to fix up its configuration
# Overwrite old name..
GIT_DIR="$GIT_DIR_NEW"
# 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"
+ VCSH_REPO_NAME="$VCSH_REPO_NAME_NEW"
# ..and clobber all old configuration
upgrade
}
# ..and clobber all old configuration
upgrade
}
# Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
# Use the template GNU mktemo defaults to
# Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
# Use the template GNU mktemo defaults to
- tempfile=$(mktemp tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
+ # The downside to this is that we need to set TMPDIR explicitly; this may or may not be empty, so...
+ [ -z "$TMPDIR" ] && TMPDIR='/tmp'
+ tempfile=$(mktemp ${TMPDIR}/tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
for gitignore in $gitignores; do
echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
for gitignore in $gitignores; do
[ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1
GIT_REMOTE="$2"
[ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
[ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1
GIT_REMOTE="$2"
[ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
+ [ -z "$VCSH_REPO_NAME" ] && fatal "$VCSH_COMMAND: could not determine repository name" 1
export VCSH_REPO_NAME
export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
elif [ "$VCSH_COMMAND" = 'version' ]; then
export VCSH_REPO_NAME
export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
elif [ "$VCSH_COMMAND" = 'version' ]; then