From 19aab6b349d49f00eeaa23b86d08b00078e03848 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Wed, 24 Feb 2010 09:02:54 +0100
Subject: [PATCH] use git-stash instead of fake commit

---
 CHANGESTODO                |  7 +++++++
 bin/psyconf                | 14 +++++++++-----
 world/net/twitter/client.c |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CHANGESTODO b/CHANGESTODO
index f683b68..8635d99 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -378,6 +378,7 @@ ________________________________________________________________________
 
 - parse.i erlaubt es den begrüßungspunkt wegzulassen wenn man
   stattdessen ne leerzeile liefert. aua -- egal, wir wechseln auf spyc
+- auch derb, er akzeptiert ".xx" statt "."
 
 - /silence conversation doesn't filter /action
 
@@ -3996,6 +3997,12 @@ person, user
 usercmd
 +	/forceenter only exists temporarily to circumvent a bug
 -	immediately show presence of a newly acquired friend, thx tg
+http/fetch
++	POST support
+new: http/oauth
 userthreads, threads, accept etc
 +	experimental microblogging on your web profile, thx tg
 	#define _flag_enable_module_microblogging
++	twitter submit
++	signatures
+
diff --git a/bin/psyconf b/bin/psyconf
index d10d57a..7acdab6 100755
--- a/bin/psyconf
+++ b/bin/psyconf
@@ -459,11 +459,11 @@ then
 #	echo "and finally 'git merge -s resolve origin' instead"
 #	exit 1
 #	echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)"
-##	(cd $sandbox/.. && cvs login && cvs -q update -dP && cvs logout)
+##	(cd $base && cvs login && cvs -q update -dP && cvs logout)
 	echo ""
 	echo "Fetching update from public git repository..."
 	echo ""
-	(cd $sandbox/.. && git fetch origin)
+	(cd $base && git fetch origin)
 	echo ""
 	echo "You can now read the changes using ${hi}\$0 -d${lo}"
 	echo "or activate the changes using ${hi}\$0 -m${lo}"
@@ -496,11 +496,15 @@ fi
 
 if test "\$1" = "-m"
 then
-    # git is seriously unsuited for this job. we need to "check in" the changes
-    # to file permissions etc or otherwise we can't update things at all...
-    (cd $base && git commit -a -m 'automatic by psyced -m')
+#   # git is seriously unsuited for this job. we need to "check in" the changes
+#   # to file permissions etc or otherwise we can't update things at all...
+#   (cd $base && git commit -a -m 'automatic by psyced -m')
+    # stash local changes
+    (cd $base && git stash)
     # merging will of course fail.. sigh
     (cd $base && git merge -s resolve origin)
+    # restore local changes
+    (cd $base && git stash apply)
     exit
 fi
 
diff --git a/world/net/twitter/client.c b/world/net/twitter/client.c
index 5d43138..83ef4d5 100644
--- a/world/net/twitter/client.c
+++ b/world/net/twitter/client.c
@@ -1,6 +1,6 @@
 /* twitter client
  *
- * - register @ http://twitter.com/apps
+ * - register @ https://twitter.com/apps
  *   - settings:
  *     - app name: e.g. psyc://your.host/
  *     - app type: browser