From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 04 Jun 2005 06:25:08 GMT
Subject: [PATCH Cogito] Add -f parameter also to cg-update
Message-ID: <1117866308.3656.120.camel@pegasus>

Hi Petr,

the attached patch adds the -f parameter to force a full pull also to
cg-update.

Regards

Marcel


Signed-off-by: Marcel Holtmann <marcel@holtmann.org>



diff --git a/cg-update b/cg-update
--- a/cg-update
+++ b/cg-update
@@ -7,16 +7,27 @@
 #
 # If local changes conflict with those of the branch updated from the
 # merge will be blocked.
+#
+# OPTIONS
+# -------
+# -f::
+#	Force the complete pull even if the heads are the same.
 
-USAGE="cg-update [BRANCH_NAME]"
+USAGE="cg-update [-f] [BRANCH_NAME]"
 
 . ${COGITO_LIB}cg-Xlib
 
+force=
+if [ "$1" = "-f" ]; then
+	force=$1
+	shift
+fi
+
 name=$1
 [ "$name" ] || { [ -s $_git/refs/heads/origin ] && name=origin; }
 [ "$name" ] || die "where to update from?"
 
-cg-pull $name || exit 1
+cg-pull $force $name || exit 1
 echo
 echo "Applying changes..."
 cg-merge $name