diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh index 11b034c..a0313ac 100755 --- a/aosp-merger/aosp-merger.sh +++ b/aosp-merger/aosp-merger.sh @@ -77,6 +77,8 @@ help_message() { main() { if [ "$#" -eq 0 ]; then export MERGEDREPOS="${TOP}/merged_repos.txt" + # Remove any existing list of merged repos file + rm -f "${MERGEDREPOS}" merge_aosp_forks read -p "Waiting for conflict resolution before squashing. Press enter when done." @@ -88,6 +90,8 @@ main() { unset MERGEDREPOS elif [ "${1}" = "aosp" ]; then export MERGEDREPOS="${TOP}/merged_repos_aosp.txt" + # Remove any existing list of merged repos file + rm -f "${MERGEDREPOS}" merge_aosp diff --git a/aosp-merger/merge-aosp-forks.sh b/aosp-merger/merge-aosp-forks.sh index e24b7e5..4a7c7b4 100755 --- a/aosp-merger/merge-aosp-forks.sh +++ b/aosp-merger/merge-aosp-forks.sh @@ -56,9 +56,6 @@ for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do done echo "#### Verification complete - no uncommitted changes found ####" -# Remove any existing list of merged repos file -rm -f "${MERGEDREPOS}" - # Ditch any existing staging branches (across all projects) repo abandon "${STAGINGBRANCH}" diff --git a/aosp-merger/merge-aosp.sh b/aosp-merger/merge-aosp.sh index 9512114..1a1c024 100755 --- a/aosp-merger/merge-aosp.sh +++ b/aosp-merger/merge-aosp.sh @@ -52,9 +52,6 @@ for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do done echo "#### Verification complete - no uncommitted changes found ####" -# Remove any existing list of merged repos file -rm -f "${MERGEDREPOS}" - # Ditch any existing staging branches (across all projects) repo abandon "${STAGINGBRANCH}"