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

Commit c10b2f79 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." am: 1ff5e0e3 

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



Change-Id: Ib8e1d235e66dfe9c6de332a6732eac63293fe6bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1fc32534 1ff5e0e3

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

}