diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-03-01 10:58:15 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-03-01 11:03:16 +0100 |
| commit | 571c52207a6c8ae1eb377e461ec6e83d90989ef1 (patch) | |
| tree | baf4e61ef40d35c9b8ecc69a432676c14f47ba30 | |
| parent | 1a7e2730e2b46dff1149e9fa2ec1f8be0e1a156b (diff) | |
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
| -rw-r--r-- | scripts/common-obs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 .. } |