From 68d049c830a7fb6d811206dd83d59c3dda03f3d5 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 2 Mar 2021 23:12:13 +0530 Subject: [PATCH] aosp-merger: Do not force-fully rebasing * I know what I'm doing, when I say merge, I want to merge, whether there's common ancestry or not! Change-Id: I75bd3818b93d33a878de53f5cdd38c138ba690c8 --- aosp-merger/aosp-merger.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh index 20a47a8..87f2f8b 100755 --- a/aosp-merger/aosp-merger.sh +++ b/aosp-merger/aosp-merger.sh @@ -100,11 +100,10 @@ for PROJECTPATH in ${PROJECTPATHS}; do # Determine whether OLDTAG is an ancestor of NEWTAG # ie is history consistent. git merge-base --is-ancestor "${OLDTAG}" "${NEWTAG}" - # If no, force rebase. + # If no, print a warning message. if [[ "$?" -eq 1 ]]; then - echo -n "#### Project ${PROJECTPATH} old tag ${OLD} is not an ancestor " - echo "of new tag ${NEWTAG}, forcing rebase ####" - PROJECTOPERATION="rebase" + echo -n "#### Warning: project ${PROJECTPATH} old tag ${OLDTAG} is not an ancestor " + echo "of new tag ${NEWTAG} ####" fi if [[ "${PROJECTOPERATION}" == "merge" ]]; then