commit 64e9b8431593f342e4707b8cd53b8b001290ed3b
author Tim Zimmermann <tim@linux4.de> Wed Jul 06 21:23:21 2022 +0200
committer Tim Zimmermann <tim@linux4.de> Wed Jul 06 21:23:23 2022 +0200
tree fe949e15582b1b986133c8ec8f85b25bb9904747
parent 4fa81474ca684014840f6ba20d840d6ac2278d54

scripts: aosp-merger: Stop using --no-edit

* When using this with --log sometimes the line
  between last log line and Change-Id is removed
  causing git to add another Change-Id when picking
  the squash

Change-Id: I0ca5ac24bdf3c05ddfe445c361c88060da13fc1a

aosp-merger/aosp-merger.sh

diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh
index 16cb523..ab3a59b 100755
--- a/aosp-merger/aosp-merger.sh
+++ b/aosp-merger/aosp-merger.sh
@@ -99,7 +99,7 @@
 
     if [[ "${PROJECTOPERATION}" == "merge" ]]; then
         echo "#### Merging ${NEWTAG} into ${PROJECTPATH} ####"
-        git merge --no-edit --log "${NEWTAG}" --into-name "$(repo info . | grep 'Manifest revision' | cut -f3 -d '/')"
+        git merge --log "${NEWTAG}" --into-name "$(repo info . | grep 'Manifest revision' | cut -f3 -d '/')"
     elif [[ "${PROJECTOPERATION}" == "rebase" ]]; then
         echo "#### Rebasing ${PROJECTPATH} onto ${NEWTAG} ####"
         git rebase --onto "${NEWTAG}" "${OLDTAG}"