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

Commit 48022f49 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use full command instead of local alias." am: afeadc35 am: 29041841 

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



Change-Id: Id8098c5d005d1c86c9f99fa375567a0508b83ff3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d59241b7 29041841

finalize-cleanup.sh

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


    repo forall -c '\

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

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

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

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

}

finalize-step-1.sh

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

    repo forall -c '\

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

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

        git checkout @ ; git branch 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