]>
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:
#!/bin/sh
# This program is licensed under the GNU GPL version 2 or later.
#!/bin/sh
# This program is licensed under the GNU GPL version 2 or later.
-# (c) Richard "RichiH" Hartmann, 2011
+# (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com> , 2011
# For details, see LICENSE. To submit patches, you have to agree to
# license your code under the GNU GPL version 2 or later.
# For details, see LICENSE. To submit patches, you have to agree to
# license your code under the GNU GPL version 2 or later.
-[ -n "$VCSH_DEBUG" ] && set -vx
-[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
-[ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
+[ -n "$VCSH_DEBUG" ] && set -vx
+[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
+[ -r "$XDG_CONFIG_HOME/vcsh/config" ] && . "$XDG_CONFIG_HOME/vcsh/config"
+[ -n "$VCSH_DEBUG" ] && set -vx
+[ -z "$VCSH_REPO_D" ] && VCSH_REPO_D="$XDG_CONFIG_HOME/vcsh/repo.d"
+[ -z "$VCSH_BASE" ] && VCSH_BASE="$HOME"
+[ -z "$VCSH_GITIGNORE" ] && VCSH_GITIGNORE='exact'
git remote add origin "$GIT_REMOTE"
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git remote add origin "$GIT_REMOTE"
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
+ if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then
+ info "remote is empty, not merging anything"
+ exit
+ fi
git fetch
for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
[ -e "$object" ] &&
git fetch
for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
[ -e "$object" ] &&
- cd "$HOME" || fatal "could not enter '$HOM E'" 11
+ cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BAS E'" 11
use
info "This operation WILL DETROY DATA!"
files=$(git ls-files)
use
info "This operation WILL DETROY DATA!"
files=$(git ls-files)
init() {
[ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
init() {
[ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
- export GIT_WORK_TREE="$HOM E"
+ export GIT_WORK_TREE="$VCSH_BAS E"
mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50
cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
git init
mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50
cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
git init
- for i in "$VCSH_BASE "/*.git; do
+ for i in "$VCSH_REPO_D "/*.git; do
echo $(basename "$i" .git)
done
}
get_files() {
echo $(basename "$i" .git)
done
}
get_files() {
- export GIT_DIR="$VCSH_BASE /$VCSH_REPO_NAME.git"
+ export GIT_DIR="$VCSH_REPO_D /$VCSH_REPO_NAME.git"
git config core.worktree "$GIT_WORK_TREE"
git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
git config vcsh.vcsh 'true'
git config core.worktree "$GIT_WORK_TREE"
git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
git config vcsh.vcsh 'true'
- [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOM E/.gitignore.d/$VCSH_REPO_NAME"
+ [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME"
- cd "$HOME" || fatal "could not enter '$HOM E'" 11
+ cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BAS E'" 11
gitignores=$(for file in $(git ls-files); do
while true; do
echo $file; new="${file%/*}"
gitignores=$(for file in $(git ls-files); do
while true; do
echo $file; new="${file%/*}"
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 '*' > "$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
- [ -d "$gitignore" ] && { 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; }
+ fi
- if diff -N "$tempfile" "$HOM E/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then
+ if diff -N "$tempfile" "$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then
rm -f "$tempfile" || error "could not delete '$tempfile'"
exit
fi
rm -f "$tempfile" || error "could not delete '$tempfile'"
exit
fi
- if [ -e "$HOM E/.gitignore.d/$VCSH_REPO_NAME" ]; then
- info "'$HOME/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$HOM E/.gitignore.d/$VCSH_REPO_NAME.bak'"
- mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOM E/.gitignore.d/$VCSH_REPO_NAME.bak" ||
- fatal "could not move '$HOME/.gitignore.d/$VCSH_REPO_NAME' to '$HOM E/.gitignore.d/$VCSH_REPO_NAME.bak'" 53
+ if [ -e "$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME" ]; then
+ info "'$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME.bak'"
+ mv -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" "$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME.bak" ||
+ fatal "could not move '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME' to '$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME.bak'" 53
- mv -f "$tempfile" "$HOM E/.gitignore.d/$VCSH_REPO_NAME" ||
- fatal "could not move '$tempfile' to '$HOM E/.gitignore.d/$VCSH_REPO_NAME'" 53
+ mv -f "$tempfile" "$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME" ||
+ fatal "could not move '$tempfile' to '$VCSH_BAS E/.gitignore.d/$VCSH_REPO_NAME'" 53
+if [ ! x$VCSH_GITIGNORE = x'exact' ] && [ ! x$VCSH_GITIGNORE = x'recursive' ]; then
+ fatal "\$VCSH_GITIGNORE must be either 'exact' or 'recursive'" 1
+fi
+
if [ "$1" = 'clone' ]; then
[ -z $2 ] && fatal "$1: please specify a remote" 1
export VCSH_COMMAND="$1"
GIT_REMOTE="$2"
[ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
export VCSH_REPO_NAME
if [ "$1" = 'clone' ]; then
[ -z $2 ] && fatal "$1: please specify a remote" 1
export VCSH_COMMAND="$1"
GIT_REMOTE="$2"
[ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
export VCSH_REPO_NAME
- export GIT_DIR="$VCSH_BASE /$VCSH_REPO_NAME.git"
+ export GIT_DIR="$VCSH_REPO_D /$VCSH_REPO_NAME.git"
elif [ "$1" = 'delete' ] ||
[ "$1" = 'enter' ] ||
[ "$1" = 'init' ] ||
elif [ "$1" = 'delete' ] ||
[ "$1" = 'enter' ] ||
[ "$1" = 'init' ] ||
[ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1
export VCSH_COMMAND="$1"
export VCSH_REPO_NAME="$2"
[ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1
export VCSH_COMMAND="$1"
export VCSH_REPO_NAME="$2"
- export GIT_DIR="$VCSH_BASE /$VCSH_REPO_NAME.git"
- [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_BASE /$3.git"
+ export GIT_DIR="$VCSH_REPO_D /$VCSH_REPO_NAME.git"
+ [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_REPO_D /$3.git"
[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
[ "$VCSH_COMMAND" = 'write-gitignore' ]
elif [ "$1" = 'list' ] ||
[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
[ "$VCSH_COMMAND" = 'write-gitignore' ]
elif [ "$1" = 'list' ] ||
elif [ -n "$2" ]; then
export VCSH_COMMAND='run'
export VCSH_REPO_NAME="$1"
elif [ -n "$2" ]; then
export VCSH_COMMAND='run'
export VCSH_REPO_NAME="$1"
- export GIT_DIR="$VCSH_BASE /$VCSH_REPO_NAME.git"
+ export GIT_DIR="$VCSH_REPO_D /$VCSH_REPO_NAME.git"
[ -d $GIT_DIR ] || { help; exit 1; }
shift 1
export VCSH_EXTERNAL_COMMAND="git $*"
elif [ -n "$1" ]; then
export VCSH_COMMAND='enter'
export VCSH_REPO_NAME="$1"
[ -d $GIT_DIR ] || { help; exit 1; }
shift 1
export VCSH_EXTERNAL_COMMAND="git $*"
elif [ -n "$1" ]; then
export VCSH_COMMAND='enter'
export VCSH_REPO_NAME="$1"
- export GIT_DIR="$VCSH_BASE /$VCSH_REPO_NAME.git"
+ export GIT_DIR="$VCSH_REPO_D /$VCSH_REPO_NAME.git"
[ -d $GIT_DIR ] || { help; exit 1; }
else
# $1 is empty, or 'help'
[ -d $GIT_DIR ] || { help; exit 1; }
else
# $1 is empty, or 'help'
-for check_directory in "$VCSH_BASE" "$HOM E/.gitignore.d"
+for check_directory in "$VCSH_REPO_D" "$VCSH_BAS E/.gitignore.d"
do
if [ ! -d "$check_directory" ]; then
if [ -e "$check_directory" ]; then
do
if [ ! -d "$check_directory" ]; then
if [ -e "$check_directory" ]; then