Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9be16c3f authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Better cleanup and revert." am: ac60bcda am: c5985788 am: a1b2042b 

Original change: https://android-review.googlesource.com/c/platform/build/+/2283395



Change-Id: I3c16655b4e5497bc013521db33abaadbf8cd7a27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8009201f a1b2042b

finalize-cleanup.sh

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ function finalize_revert_local_changes_main() { 
    repo selfupdate



    repo forall -c '\

        git checkout . ; git clean -fdx ;\

        git checkout . ; git revert --abort ; git clean -fdx ;\

        git checkout @ ; git b fina-step1 -D ; git reset --hard; \

        repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;'

}

finalize-step-1.sh

+2 −2
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ 


function revert_local_changes() {

    repo forall -c '\

        git checkout . ; git clean -fdx ;\

        git checkout . ; git revert --abort ; git clean -fdx ;\

        git checkout @ ; git b fina-step1 -D ; git reset --hard; \

        repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;\

        previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT | tr \n \040)" ;\

        if [[ $previousHash ]]; then git revert --no-commit $previousHash ; fi ;'

        if [[ $previousHash ]]; then git revert --no-commit --strategy=ort --strategy-option=theirs $previousHash ; fi ;'

}



function commit_changes() {