On Tue, Mar 12, 2024 at 3:20 PM Bo YU <tsu.y...@gmail.com> wrote: > > Hi team！ > > Sorry to disturb here again. > > Now I am trying to update golang-github-go-jose-go-jose with a new > upstream release due to one CVE issue, see: #1065814.
salsa repo is here: https://salsa.debian.org/go-team/packages/golang-github-go-jose-go-jose sorry again. Bo > > Everything is okay, but when I look back it again, I realize I had > made a mistake for it: I forgot to merge upstream history when `gbp > import-orig`. > > I think I should use `gbp import-orig --pristine-tar --uscan` instead > of `gbp import-orig --pristine-tar --upstream-vcs-tag=<commit-ish> > --uscan`. > > So how I can fix the upstream branch now? Or just like that. And in > fact, could you help me to understand why the upstream branch will > contain upstream history? > > TIA. > Bo > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1065814
