Git branch layout for packages requiring DFSG-cleaning

Hello,

I found some conflicting information about the recommended branch layout
and I'm wondering why that is (mistake? outdated recommendation) and
what folks tend to use in practice and why.

- DEP14 recommends upstream/* [1] for the *repacked* sources but says
  nothing about the original sources in that case
- gbp manual recommends `upstream/latest` for the *original* sources, and
  for the repacked sources: `dfsg/latest` in one place [2] and
  `dfsg_clean` in another place [3]

I'm leaning towards setting `upstream-branch = dfsg/latest` in
debian/gbp.conf to make it a bit more visible that a repacking step is
needed.

But I'm wondering if I'm signing up for trouble down the road by doing
this.

regards,
Marcin

[1] https://dep-team.pages.debian.net/deps/dep14/ - section "About repacked upstream sources"
[2] https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.branch.naming.html
[3] https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.special.html#gbp.special.dfsgfree