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

Commit fbb39544 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Only revert until the latest baseline."

parents 576c382c 8361b3a1

finalize-step-1.sh

+6 −1
Original line number Diff line number Diff line
@@ -11,7 +11,12 @@ function revert_to_unfinalized_state() { 
        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 ;\

        baselineHash="$(git log --format=%H --no-merges --max-count=1 --grep ^FINALIZATION_STEP_1_BASELINE_COMMIT)" ;\

        if [[ $baselineHash ]]; then

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

        else

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

        fi ; \

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

}