[Piuparts-commits] [SCM] piuparts git repository branch, piatti.git, updated. f3d478e5f291baaf9e84d1982ca5e2e6b353a232
Holger Levsen
holger at layer-acht.org
Sun Apr 1 08:47:52 UTC 2012
The following commit has been merged in the piatti.git branch:
commit 90919a4db0cc1e2c0224e4ea76ef8c96c6c94a2c
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Feb 27 15:12:40 2012 +0100
also do git fetch to get rid off of irritating local branch differences
diff --git a/home/piupartss/bin/update-piuparts-setup b/home/piupartss/bin/update-piuparts-setup
index 7aef772..011ab45 100755
--- a/home/piupartss/bin/update-piuparts-setup
+++ b/home/piupartss/bin/update-piuparts-setup
@@ -49,8 +49,9 @@ if [ ! -z "$1" ] ; then
git checkout $1
fi
-# git pull if $2 is given
+# git fetch+pull if $2 is given
if [ ! -z "$2" ] ; then
+ git fetch $2
git pull $2 $1
fi
@@ -123,8 +124,9 @@ if [ ! -z "$1" ] ; then
git checkout $1
fi
-# git pull if $2 is given
+# git fetch+pull if $2 is given
if [ ! -z "$2" ] ; then
+ git fetch $2
git pull $2 $1
fi
--
piuparts git repository
More information about the Piuparts-commits
mailing list