jenkins-bot has submitted this change and it was merged.
Change subject: multigit.sh: Clean the repo before checking out a new branch.
......................................................................
multigit.sh: Clean the repo before checking out a new branch.
`git checkout` will fail if the tree is dirty. We then don't need to clean
after the checkout, since the tree will already be clean.
Change-Id: I4de756bb3ccc637f6f544cbe884cf4984597d32d
---
M bin/multigit.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/multigit.sh b/bin/multigit.sh
index f6642c5..15dc6fe 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 reset --hard $reset_branch
- git clean -q -x -f -d
set +x
}
--
To view, visit https://gerrit.wikimedia.org/r/130551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4de756bb3ccc637f6f544cbe884cf4984597d32d
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@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
