[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Just fetch and overwrite from origin rather than merging.

[Holger Levsen]

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


Commits:
5595d7f9 by Jelmer Vernooij at 2020-07-24T12:00:43+02:00
Just fetch and overwrite from origin rather than merging.

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

- - - - -


1 changed file:

- bin/janitor_setup_worker.sh


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -25,8 +25,7 @@ else
 	pushd $TARGET/debian-janitor
 	git status || /bin/true
 	git fetch
-	git reset --hard HEAD
-	git merge origin/master
+	git reset --hard origin/master
 	git submodule update --init
 	popd
 fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/5595d7f941ca3632b2af07c2a6cb3a676fd102f6

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/5595d7f941ca3632b2af07c2a6cb3a676fd102f6
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/20200724/2ae6e58f/attachment.html>