[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Why "New upstream version ..." commits in the upstream branch?



Dear DGPT,

I see that dh-make-golang creates the `upstream` branch and an empty
commit "New upstream version..." on it, eg. [0].

What's the purpose of such empty commit? I can't find anything related
in DEP-14 [1].

I would expect that the upstream branch tracked the upstream repo
without any change.

Instead I get this surprising history where upstream's v0.1.1 and
upstream/0.1.1 do not point to the same commit.

> commit 3ac6c51652986e7f14f0f5c31d67c3c1e7a6448f (tag: upstream/0.1.1, origin/upstream, go-team/upstream)
> Author: Domenico Andreoli <cavok@debian.org>
> Date:   Fri Jun 3 22:17:04 2022 +0200
> 
>     New upstream version 0.1.1
> 
> commit fdb84e7b08f7350541f88dbf33166a2b4437d491 (tag: v0.1.1)
> Author: morphar <dan@techba.se>
> Date:   Sun Dec 26 17:59:41 2021 +0100
> 
>     Fix test, hopefully

Therefore, when later a new upstream version is released, the `upstream`
branch cannot fast forward to the new release tag but has to create
a merge commit. The `upstream` is effectively a fork of the upstream
branch just for the sake of tagging versions with such empty commits.

What am I missing? :)

Dom

[0] https://salsa.debian.org/cavok/golang-github-flowstack-go-jsonschema/-/commit/3ac6c51652986e7f14f0f5c31d67c3c1e7a6448f
[1] https://dep-team.pages.debian.net/deps/dep14/

-- 
rsa4096: 3B10 0CA1 8674 ACBA B4FE  FCD2 CE5B CF17 9960 DE13
ed25519: FFB4 0CC3 7F2E 091D F7DA  356E CC79 2832 ED38 CB05

Attachment: signature.asc
Description: PGP signature


Reply to: