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

Commit 6a379936 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Concatenate cl hashes so that git revert can revert multiple commits."... 

Merge "Concatenate cl hashes so that git revert can revert multiple commits." am: 1ff5e0e3 am: c10b2f79

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



Change-Id: I2b7a03748f4a7eb305ccfad1989d0716c9e4f30e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73d4032c c10b2f79

finalize-step-1.sh

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ function revert_local_changes() { 
        git checkout . ; 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)" ;\

        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 ;'

}