}
repos_urls="
-. | | master |
-data/xonotic-data.pk3dir | | master |
-data/xonotic-music.pk3dir | | master |
-data/xonotic-nexcompat.pk3dir | | master | no
-darkplaces | | div0-stable | svn
-netradiant | | master |
-div0-gittools | | master | no
-d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master |
-data/xonotic-maps.pk3dir | | master |
-mediasource | | master | no
-fteqcc | http://github.com/Blub/qclib.git | master |
+. | | master |
+data/xonotic-data.pk3dir | | master |
+data/xonotic-music.pk3dir | | master |
+data/xonotic-nexcompat.pk3dir | | master | no
+darkplaces | | div0-stable | svn
+netradiant | | master |
+div0-gittools | | master | no
+d0_blind_id | | master |
+data/xonotic-maps.pk3dir | | master |
+mediasource | | master | no
+fteqcc | | xonotic-stable | noautocrlf
"
# todo: in darkplaces, change repobranch to div0-stable
verbose git config --unset remote.origin.pushurl || true
fi
verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
- verbose git config core.autocrlf input
+ case ",`repoflags "$d"`," in
+ *,noautocrlf,*)
+ verbose git config --unset core.autocrlf || true
+ ;;
+ *)
+ verbose git config core.autocrlf input
+ ;;
+ esac
if [ -z "`git config push.default || true`" ]; then
verbose git config push.default current # or is tracking better?
fi
reportecho "$o"
}
for d in $repos; do
+ case "$d" in
+ fteqcc)
+ # sorry, fteqcc repo is managed manually
+ continue
+ ;;
+ esac
enter "$d0/$d" verbose
base="`repobranch "$d"`"
reportecho "In $d:"
reportecho4 "--> test failed, postponed"
fi
else
+ # apply crlf, or other cleanup filters (non-behavioural changes)
+ git reset --hard
+ find . -type f -exec touch {} \;
+ git commit -a --amend -C HEAD || true # don't fail if nothing to commit
+
echo "MERGING"
case ",`repoflags "$d"`," in
*,svn,*)
rmuntracked=true
elif [ x"$X" = x"-D" ]; then
killbranches=true
+ elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+ msg ''
+ msg ' _____'
+ msg ' ,--'\''-\\P/`\\ FFFFFFF'
+ msg ' __/_ B/,-.\\ FFFFFFF'
+ msg ' / _\\ (// O\\\\ FFFFFF'
+ msg '| (O `) _\\._ _)\\ FFFUU'
+ msg '| |___/.^d0~~"\\ \\ UUUU'
+ msg '| |`~'\'' \\ | UUUU'
+ msg '| | __,C>|| UUUU'
+ msg '\\ /_ ,-/,-'\'' | UUUU'
+ msg ' \\\\_ \\_>~'\'' / UUUU-'
+ msg ''
else
- break
+ msg "Unknown arg: $X"
fi
found=true
shift
# music: reduce bitrate
verbose export do_jpeg=true
verbose export jpeg_qual_rgb=80
- verbose export jpeg_qual_a=99
+ verbose export jpeg_qual_a=97
verbose export do_dds=false
verbose export do_ogg=true
verbose export ogg_qual=1