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

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

Merge "Use full command instead of local alias."

parents 072fb49b 9fa8d9d5

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