Re: Status of dgit (good for NMUs and fast-forwarding Debian branches)
Ian Jackson writes ("Re: Status of dgit (good for NMUs and fast-forwarding Debian branches)"):
> Russ Allbery writes ("Re: Status of dgit (good for NMUs and fast-forwarding Debian branches)"):
> > Ian Jackson <ijackson@chiark.greenend.org.uk> writes:
> > > I should also mention a non-goal:
> ...
> > > * I have no plans to support a workflow where dgit's git tree
> > > contains different contents to the source packages.
> ...
> > I believe, if I understand this correctly, this will cause problems for
> > the use of local-options and local-patch-header to set single-debian-patch
> > for maintainer uploads.
>
> I'm not sure what you mean, but I don't think so.
Ah, wait, I think maybe I can speculate as to what you mean.
I guess that you think I'm saying that the series of git commits in
the dgit history must correspond to the series of patches found in the
source package.
But no, that's not what I mean. I just mean that the git tree object
referenced by the commit (that is, the set of files and directories in
that commit) must be identical to the tree yielded by unpacking the
source package.
There is no requirement on the shape of the history of the commit on
which you run dgit push, other than that it is a fast-forward on the
dgit suite branch. Specifically the commit you push must be a
descendant of dgit's idea of the current state of the archive (which
might be a synthetic commit representing a non-dgit upload, or a
commit previously subjected to dgit push).
Ian.
Reply to: