#
# rats: how did i set up that archive?
# we need to have those steps someplace.
+# the remote config is like this so far:
+#
+#fred@serene $ git remote -v
+#origin ssh://fred_t_hamster@git.code.sf.net/p/feistymeow/trunk (fetch)
+#origin ssh://fred_t_hamster@git.code.sf.net/p/feistymeow/trunk (push)
+#upstream git@feistymeow.org:feisty_meow (fetch)
+#upstream git@feistymeow.org:feisty_meow (push)
+#
+# so, we've got it hooked together with a named remote called "upstream" that is
+# actually our source location, and the target is actually the "origin" remote for
+# the repository.
+
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
-git push origin master
+unset GIT_SSH
+git push origin master <"$PASSWORD_FILE"
popd
+
+