From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 14 Dec 2016 17:28:58 +0000 (+0100)
Subject: phase1: manually fetch remote Git refs
X-Git-Tag: v1~203
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eaf8408145a72e13fbb602c172487d644ab8cfc8;p=buildbot.git

phase1: manually fetch remote Git refs

Buildbot never updates the remote branch reference on incremental updates,
causing scripts/getver.sh to assume a dirty tree with unpublished local
commits.

Add a manual command step to update the remote branch ref in order to bring
the remote tracking branch history in sync with the local branch.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index dc1e66d..b9bbf12 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -330,6 +330,14 @@ for target in targets:
 		mode = 'incremental',
 		method = 'clean'))
 
+	# update remote refs
+	factory.addStep(ShellCommand(
+		name = "fetchrefs",
+		description = "Fetching Git remote refs",
+		command = ["git", "fetch", "origin", "+refs/heads/%s:refs/remotes/origin/%s" %(repo_branch, repo_branch)],
+		haltOnFailure = True
+	))
+
 	# fetch tags
 	factory.addStep(ShellCommand(
 		name = "fetchtag",