# rats: how did i set up that archive?
# we need to have those steps someplace.
+dir="$1"; shift
+if [ -z "$dir" ]; then
+ dir=.
+fi
+
+# this file needs to have our sourceforge password in it.
+PASSWORD_FILE="$HOME/.secrets/sourceforge_password"
+
+if [ ! -f "$PASSWORD_FILE" ]; then
+ echo "This script requires a password stored in the file:"
+ echo " $PASSWORD_FILE"
+ exit 1
+fi
+
+pushd "$dir"
git fetch upstream
git merge upstream/master
+unset GIT_SSH
+git push origin master <"$PASSWORD_FILE"
+popd
-git push origin master