[rkward-cvs] [rkward] scripts: Oh well, we'll try to avoid fast-forwarding the imported commits, next time.

[Thomas Friedrichsmeier]

Git commit 90539976584607807ad67e2421cddd6d7bbfb9fb by Thomas Friedrichsmeier.
Committed on 11/01/2015 at 20:21.
Pushed by tfry into branch 'master'.

Oh well, we'll try to avoid fast-forwarding the imported commits, next time.

M  +3    -0    scripts/import_external_plugin.sh

http://commits.kde.org/rkward/90539976584607807ad67e2421cddd6d7bbfb9fb

diff --git a/scripts/import_external_plugin.sh b/scripts/import_external_plugin.sh
index e33166e..4e146bf 100755
--- a/scripts/import_external_plugin.sh
+++ b/scripts/import_external_plugin.sh
@@ -22,6 +22,9 @@ BASEDIR=`pwd`
 cd ${BASEDIR}
 WORKDIR=${BASEDIR}/import_tmp
 
+# Make sure to work on an up-to-date (pushable, without fast-forwards) clone
+git pull --rebase
+
 # clone and filter external repo
 git clone ${EXTERNAL_REPO} import_tmp
 cd ${WORKDIR}