summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-23 04:07:40 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-23 04:07:44 +0200
commit2581b50408418c698b35e946633f129f1e7d238d (patch)
treed3371dc965ae6ac6839a985f9d0fd73b3b737361 /contrib
parent851802b927ccfcb061a2774fdc5de12141426b5c (diff)
jenkins-build-common.sh: cosmetic: clear repos a bit later
If we rm -rf * and then checkout a branch, the log prints the entire file tree as deleted. Instead, rm just before the git reset --hard, which avoids the extra output. Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180
Diffstat (limited to 'contrib')
-rw-r--r--contrib/jenkins-build-common.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index 63e0ba8..779f965 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -77,7 +77,6 @@ have_repo() {
git clone "$git_url/$repo" "$repo"
fi
cd "$repo"
- rm -rf *
git fetch origin
# Figure out whether we need to prepend origin/ to find branches in upstream
@@ -87,6 +86,7 @@ have_repo() {
git branch -D build_branch || true
git checkout -b build_branch "$branch"
+ rm -rf *
git reset --hard "$branch"
git rev-parse HEAD