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

90539976 · Thomas Friedrichsmeier · e5b237ad · 90539976
Commit 90539976 authored Jan 11, 2015 by Thomas Friedrichsmeier
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

scripts/import_external_plugin.sh scripts/import_external_plugin.sh +3 -0

No files found.
--- 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}