Skip to content
GitLab
Commit 3139ae00 authored by Jelmer Vernooij's avatar Jelmer Vernooij Committed by Holger Levsen
Browse files

Force fetch from the upstream janitor repository, rather than attempting to merge. 



Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 89b77776
Hide whitespace changes
Inline Side-by-side
bin/janitor_setup_worker.sh
View file @ 3139ae00
...@@ -19,10 +19,11 @@ if [ ! -d $TARGET/debian-janitor ]; then ...@@ -19,10 +19,11 @@ if [ ! -d $TARGET/debian-janitor ]; then
git clone --recurse $JANITOR_REPO_URL $TARGET/debian-janitor git clone --recurse $JANITOR_REPO_URL $TARGET/debian-janitor
else else
pushd $TARGET/debian-janitor pushd $TARGET/debian-janitor
git reset --hard
git status || /bin/true git status || /bin/true
git fetch
git reset --hard HEAD
git merge origin/master
git submodule update --init git submodule update --init
git pull --recurse
popd popd
fi fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment