diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | dgit | 7 | ||||
| -rw-r--r-- | dgit.1 | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e97cb3c..c63b7e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ dgit (1.5~~) unstable; urgency=medium any Gbp-Pq headers (that we understand). * Several dgit-generated commits now have slightly better annotations from dgit about what it was doing. + * Make --quilt=gbp the default for dgit gbp-build. Infrastructure: * Better error handling in dgit-repos-policy-debian. @@ -4671,6 +4671,10 @@ sub cmd_build { printdone "build successful\n"; } +sub pre_gbp_build { + $quilt_mode //= 'gbp'; +} + sub cmd_gbp_build { my @dbp = @dpkgbuildpackage; @@ -5101,6 +5105,9 @@ if (!@ARGV) { my $cmd = shift @ARGV; $cmd =~ y/-/_/; +my $pre_fn = ${*::}{"pre_$cmd"}; +$pre_fn->() if $pre_fn; + if (!defined $rmchanges) { local $access_forpush; $rmchanges = access_cfg_bool(0, 'rm-old-changes'); @@ -139,6 +139,9 @@ Runs with some suitable options. Options and arguments after gbp-build will be passed on to git-buildpackage. +By default this uses \-\-quilt=gbp, so HEAD should be a +git-buildpackage style branch, not a patches-applied branch. + Tagging, signing and actually uploading should be left to dgit push. .TP \fBdgit push\fR [\fIsuite\fP] @@ -430,7 +433,7 @@ do not want your branch changed by dgit. is for use with git-buildpackage. Your HEAD is expected to be a patches-unapplied git branch, except that it might contain changes -to upstream .gitignore files. +to upstream .gitignore files. This is the default for dgit gbp-build. .B --quilt=dpm is for use with git-dpm. |