Change in osmo-ci[master]: OBS: don't amend distro specific patch

osmith gerrit-no-reply at lists.osmocom.org
Mon Mar 1 10:26:27 UTC 2021


osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23154 )

Change subject: OBS: don't amend distro specific patch
......................................................................

OBS: don't amend distro specific patch

Make a separate commit for the distro specific patch, instead of using
"git commit --amend". Otherwise, if HEAD was pointing to the latest tag
before the amend, git-version-gen will use the previous tag instead of
the latest one after the amend.

Fixes: OS#5053
Change-Id: I67770a19ee60101df989f98673a22705ad50beed
---
M scripts/common-obs.sh
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  osmith: Verified
  pespin: Looks good to me, approved



diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh
index edd48df..b6be98c 100644
--- a/scripts/common-obs.sh
+++ b/scripts/common-obs.sh
@@ -211,6 +211,6 @@
 		exit 1
 	fi
 	patch -p1 < "$patch"
-	git commit --amend --no-edit debian/
+	git commit -m "auto-commit: apply $patch" debian/
 	cd ..
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23154
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I67770a19ee60101df989f98673a22705ad50beed
Gerrit-Change-Number: 23154
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210301/b45379a9/attachment.htm>


More information about the gerrit-log mailing list