* [gentoo-dev] [PATCH git-2.eclass 1/2] Clean up non-bare checkout before updating.
@ 2011-12-23 14:34 99% Michał Górny
0 siblings, 0 replies; 1+ results
From: Michał Górny @ 2011-12-23 14:34 UTC (permalink / raw
To: gentoo-dev; +Cc: Michał Górny
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=395247
---
eclass/git-2.eclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index f1ed79f..4f0b65b 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -344,6 +344,8 @@ git-2_update_repo() {
if [[ ${EGIT_LOCAL_NONBARE} ]]; then
# checkout master branch and drop all other local branches
git checkout ${EGIT_MASTER} || die "${FUNCNAME}: can't checkout master branch ${EGIT_MASTER}"
+ git clean -d -f -x || die "${FUNCNAME}: failed to clean checkout dir"
+
for x in $(git branch | grep -v "* ${EGIT_MASTER}" | tr '\n' ' '); do
debug-print "${FUNCNAME}: git branch -D ${x}"
git branch -D ${x} > /dev/null
--
1.7.8.352.g876a6f.dirty
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2011-12-23 14:34 99% [gentoo-dev] [PATCH git-2.eclass 1/2] Clean up non-bare checkout before updating Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox