From 571c52207a6c8ae1eb377e461ec6e83d90989ef1 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Mon, 1 Mar 2021 10:58:15 +0100
Subject: 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
---
 scripts/common-obs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ osmo_obs_checkout_copy() {
 		exit 1
 	fi
 	patch -p1 < "$patch"
-	git commit --amend --no-edit debian/
+	git commit -m "auto-commit: apply $patch" debian/
 	cd ..
 }
-- 
cgit v1.2.3