darkplaces
fteqcc@git://github.com/Blub/qclib.git
div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+ netradiant
"
repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
cmd=$1
shift
+d00=`pwd`
+case "$0" in
+ */*)
+ cd "${0%/*}"
+ ;;
+esac
+
d0=`pwd`
case "$cmd" in
update|pull)
;;
esac
verbose git pull
- cd "$d0"
+ cd "$d00"
checkself "$0" "$@"
cd "$d0/$d"
verbose git remote prune origin
else
verbose git checkout master
fi
- cd "$d0"
+ cd "$d00"
checkself "$0" "$@"
+ cd "$d0"
done
if ! $exists; then
echo "The requested branch was not found in any repository."
cd "$d0/$d"
a=
while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Branch in $d?"
+ echo "Branch in \"$d\"?"
read -r a
done
if [ x"$a" = x"y" ]; then
cd "$d0/$d"
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
- a=
+ if git diff HEAD | grep .; then
+ # we have uncommitted changes
+ a=
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ verbose git commit -a
+ fi
+ fi
if git log "origin/$r".."$r" | grep .; then
+ a=
while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Push $r in $d?"
+ echo "Push \"$r\" in \"$d\"?"
read -r a
done
if [ x"$a" = x"y" ]; then