LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aosp-merger: Do not force-fully rebasing

Browse Source 
* I know what I'm doing, when I say merge, I want to merge,
  whether there's common ancestry or not!

Change-Id: I75bd3818b93d33a878de53f5cdd38c138ba690c8
This commit is contained in:
Chirayu Desai
2021-03-02 23:12:13 +05:30
parent c5e7492b3b
commit 68d049c830
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
aosp-merger/aosp-merger.sh
View File

@@ -100,11 +100,10 @@ for PROJECTPATH in ${PROJECTPATHS}; do
# Determine whether OLDTAG is an ancestor of NEWTAG # Determine whether OLDTAG is an ancestor of NEWTAG
# ie is history consistent. # ie is history consistent.
git merge-base --is-ancestor "${OLDTAG}" "${NEWTAG}" git merge-base --is-ancestor "${OLDTAG}" "${NEWTAG}"
# If no, force rebase. # If no, print a warning message.
if [[ "$?" -eq 1 ]]; then if [[ "$?" -eq 1 ]]; then
echo -n "#### Project ${PROJECTPATH} old tag ${OLD} is not an ancestor " echo -n "#### Warning: project ${PROJECTPATH} old tag ${OLDTAG} is not an ancestor "
echo "of new tag ${NEWTAG}, forcing rebase ####" echo "of new tag ${NEWTAG} ####"
PROJECTOPERATION="rebase"
fi fi
if [[ "${PROJECTOPERATION}" == "merge" ]]; then if [[ "${PROJECTOPERATION}" == "merge" ]]; then