From 9fa8d9d5c58f628e3e12f1301f91c54b0c4613de Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Tue, 8 Nov 2022 23:19:47 +0000 Subject: [PATCH] Use full command instead of local alias. Bug: 243966946 Test: local Change-Id: I99b75cb8f9d35ba6615f27adc5dd0c10a47edaac --- finalize-cleanup.sh | 2 +- finalize-step-1.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/finalize-cleanup.sh b/finalize-cleanup.sh index e3bca6346c..c62a97c190 100755 --- a/finalize-cleanup.sh +++ b/finalize-cleanup.sh @@ -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 ;' } diff --git a/finalize-step-1.sh b/finalize-step-1.sh index bbcf03ec7d..1ca98d4ada 100755 --- a/finalize-step-1.sh +++ b/finalize-step-1.sh @@ -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