[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] fixup branch name

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
72243015 by Holger Levsen at 2018-10-17T20:44:36Z
fixup branch name

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/chroot-run.sh


Changes:

=====================================
bin/chroot-run.sh
=====================================
@@ -180,7 +180,7 @@ apt-get install build-essential devscripts git
 if [ "$1" = "gbp" ] ; then
 	apt-get install git-buildpackage
 	# there are only two jobs using this and both have no debian directory in the master branch
-	git merge debian
+	git merge origin/debian
 fi
 if [ -f debian/control ] ; then
 	cat debian/control



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/722430153c581558084326761a54637f97c62985

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/722430153c581558084326761a54637f97c62985
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181017/4376880d/attachment.html>