StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use full command instead of local alias." am: afeadc3561 am: 2904184117

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

Change-Id: Id8098c5d005d1c86c9f99fa375567a0508b83ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-09 03:46:16 +00:00
committed by Automerger Merge Worker
parent d59241b72c 2904184117
commit 48022f4977
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
finalize-cleanup.sh
View File

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

2
finalize-step-1.sh
View File

@@ -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