jenkins-bot has submitted this change and it was merged.
Change subject: multigit.sh: Don't let dirty files prevent a checkout.
......................................................................
multigit.sh: Don't let dirty files prevent a checkout.
This reverts 6d95448aa9f4c5611f91da2c2d27667fb420f766 and fixes the
problem in a better way: just add the `-f` option to `git checkout`.
Change-Id: Iae63dcc8a5d04aae874ff080351e792550cab87c
---
M bin/multigit.sh
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/multigit.sh b/bin/multigit.sh
index 15dc6fe..62da0ba 100755
--- a/bin/multigit.sh
+++ b/bin/multigit.sh
@@ -174,9 +174,9 @@
reset_branch="remotes/origin/$branch"
fi
set -x
- git clean -q -x -f -d
- git checkout $branch
+ git checkout -f $branch
git reset --hard $reset_branch
+ git clean -q -x -f -d
set +x
}
--
To view, visit https://gerrit.wikimedia.org/r/130652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae63dcc8a5d04aae874ff080351e792550cab87c
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
