X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase1%2Fmaster.cfg;h=04879e800f6ebfa17470714bc679dc1ccfc178b7;hb=da4174f4bd4d3af7e10f3d9f3fcd5ac713b33b09;hp=d7529bd0c2ff16c7c421d4c0d0a6282838a5fa3a;hpb=ae98cd085f8b5df0085d28f3e4340a8a6a5b3461;p=buildbot.git

diff --git a/phase1/master.cfg b/phase1/master.cfg
index d7529bd..04879e8 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -389,7 +389,7 @@ for target in targets:
 		description = "Tagging Git repository",
 		command = [home_dir+'/maketag.sh', '-i', '-k', str(gpg_keyid or ''),
 		           '-p', str(gpg_passfile or ''), '-v', WithProperties("%(tag:-)s")],
-		workdir = home_dir+'/source.git',
+		path = home_dir+'/source.git',
 		env = {'GNUPGHOME': gpg_home},
 		haltOnFailure = True,
 		doStepIf = IsTaggingRequested,
@@ -400,7 +400,7 @@ for target in targets:
 	factory.addStep(ShellCommand(
 		name = "switchbranch",
 		description = "Checking out Git branch",
-		command = "if [ -d .git ]; then git checkout '%s'; else exit 0; fi" % repo_branch,
+		command = "if [ -d .git ]; then git fetch && git checkout '%s'; else exit 0; fi" % repo_branch,
 		haltOnFailure = True,
 		doStepIf = IsNoTaggingRequested
 	))