diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 12:36:51 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 21:11:18 +0100 |
| commit | 1a6c2d4d90584ac066bea24db0cfcfb9800ff5d9 (patch) | |
| tree | 90a7b35be579f97e50759135c7f003bd513b00fa | |
| parent | 93ea72b76e11937b23354c66dda2f8962a9f6116 (diff) | |
dgit(1): baredebian+tarball: Document new quilt mode
Closes: #931253
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | dgit.1 | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -695,7 +695,7 @@ of git merge -s ours) to stitch the archive's version into your own git history, so that your push is a fast forward from the archive. (In quilt mode -.BR gbp ", " dpm ", " unpatched " or " baredebian , +.BR gbp ", " dpm ", " unpatched " or " baredebian *, implying a split between the dgit view and the maintainer view, the pseudo-merge will appear only in the dgit view.) .TP @@ -853,7 +853,7 @@ Do not check whether source format `3.0 (quilt)' metadata needs fixing up. If you use this option and the metadata did in fact need fixing up, dgit push will fail. .TP -.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian +.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian [ +tarball ] Tell dgit that you are using a nearly-dgit-compatible git branch, aka a .BR "maintainer view" , @@ -897,7 +897,18 @@ all edited upstream files are properly represented as patches: dgit relies on debian/patches being correct. -With --quilt=gbp|dpm|unapplied|baredebian, +.B --quilt=baredebian+tarball +is like --quilt=baredebian, +but is used when there is no appropriate upstream git history. +To construct the dgit view, +dgit will import your orig tarballs' contents into git. +In this mode, dgit cannot check that +the upstream parts of your upload correspond to what you intend: +dgit relies on +the right orig tarball(s) existing, and +debian/patches being correct. + +With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like quilt-fixup and build) will automatically generate a conversion of your git branch into the right form. dgit push will push the @@ -961,7 +972,7 @@ to make a correct `3.0 (quilt)' source package. is the default, and splits the view only when needed: i.e., when you are working with a `3.0 (quilt)' source package and a splitting quilt mode: -\-\-[quilt=]gbp, dpm, unpatched or baredebian. +\-\-[quilt=]gbp, dpm, unpatched or baredebian*. .B always splits the view regardless of the source format and the quilt mode. |