diff --git a/vendorsetup.sh b/vendorsetup.sh index 39b8be366ef6466534359689f7847a2273871cf2..2b894acbbd585c12cd8ba30073563fe780271a02 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -73,8 +73,7 @@ __abandon_branch() return 1 fi fi - local currentRev=$(${REPO} info -l . | sed -ne 's/^Current revision: \(\w*\)$/\1/p') - git reset --hard $currentRev + git reset --hard HEAD git clean -dfx ${REPO} abandon b2g_autogen_ephemeral_branch . fi @@ -237,8 +236,7 @@ __patch_tree() fi fi # Ensure the project is clean before applying patches to it - local currentRev=$(${REPO} info -l . | sed -ne 's/^Current revision: \(\w*\)$/\1/p') - git reset --hard $currentRev + git reset --hard HEAD git clean -dfx declare -a PATCHNAME