git-debrebase: convert-from-*: leave debrebase-last refs

[dgit.git] / debian / changelog

dgit (6.7~) unstable; urgency=medium

  * git-debrebase: Improve ffq head recording message.
  * git-debrebase: Better (less copious by default) debug output.
  * git-debrebase: Do not bail making patches if there aren't any.
  * test suite: Set DEBFULLNAME
  * git-debrebase: scrap works properly when it does only rebase --abort.
  * dgit(1): Encourage --overwrite rather than --overwrite=version.
  * test suite: unset GIT_EDITOR, so it works if user has that set.
  * git-debrebase: Improve laundry performance by a factor of ~55:1,
    and analysis performance by factor of ~4.2:1.  Closes:#905995.
  * git-debrebase: `prepush' is now a silent no-op if the branch is
    unstitched.  This is more friendly.
  * git-debrebase: On rebase, always save ffq-prev even if we were
    both stitched and laundered.  Closes:#905975.
  * git-debrebase: convert-from-*: Snag on patches in d/patches which are
    not in series, because they will be deleted.  Closes:#904997.
  * changelog: Add close note for #905400 to changelog entry for 6.5.
  * git-debrebase: convert-from-gbp: Improve messages.  Closes:#906641.
  * git-debrebase: Highly experimental merge resolution support,
    enabled only with special command line option.
  * git-debrebase: Check in convert-from-* whether ffq-prev or
    debrebase-last indicate that we are already in gdr format.
  * git-debrebase: convert-from-*: leave debrebase-last refs to
    hint to everyone that this is now a gdr branch.

 --

dgit (6.6) unstable; urgency=medium

  * test suite: Fix gdr's calls to dgit when run formally in
    autopkgtest.  (Affects gdr-import-dgitview.)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 Aug 2018 10:42:01 +0100

dgit (6.5) unstable; urgency=medium

  git-debrebase new features:
  * git-debrebase: Provide new convert-from-dgit-view operation.
    The output is, unavoidably, not very pretty.  Closes:#905322.
  * git-debrebase: New subcommand `scrap'.  Closes:#905063.

  git-debrebase error handling improvements:
  * git-debrebase: Properly reject bare dgit dsc imports.  Closes:905400.
  * git-debrebase: Improve some error message formatting.
  * git-debrebase: Check for git-rebase in progress and abort most operations.

  dgit improvements:
  * dgit: Improve error message for unknown suite, to suggest -d.
  * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias.
  * dgit: Provide print-unapplied-treeish subcommand.

  Test suite changes:
  * test suite: Add t-tstunt-parsechangelog to many gdr tests.
  * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.
  * test suite: gdr-import-dgitview: New test for dgit dsc imports.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 04 Aug 2018 17:53:57 +0100

dgit (6.4) unstable; urgency=medium

  * git-debrebase(1): Fix typo "unappled".  Closes:#905064.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 02 Aug 2018 08:24:32 +0100

dgit (6.3) unstable; urgency=medium

  * git-debrebase: breakwater: Fix error message for unprocessable
    commits.  Closes:#905003.
  * git-debrebase: new-upstream: Fix error message for new version
    with bad syntax.
  * git-debrebase test suite: Test messages about unprocessable commits.
  * git-debrebase: new-upstream: Fix handling of epochs.
  * git-debrebase: convert-from-gbp: Use same algorithm for finding
    upstream commitish as new-upstream.  Closes:#905062.
  * git-debrebase: Improve error messages for bad options.
  * git-debrebase: Improve error message for convert-from-gbp
    upstream discrepancy.  Closes:#905078.
  * git-debrebase(5): Add ILLEGAL OPERATIONS section.  (Re#905004.)
  * git-debrebase(1): Warn against plain git rebase.  (Re#905004.)
  * dgit-maint-debrebase(7): Warn more against plain git rebase.
    Closes:#905004.
  * git-debrebase: Implement --help, providing a summary.
    Closes:#904990.

 -- Ian Jackson <ian@zealot.relativity.greenend.org.uk>  Thu, 02 Aug 2018 03:45:40 +0100

dgit (6.2) unstable; urgency=medium

  * dgit(1): Improve and correct --build-products-dir description.
  * dgit: Minor code cleanup.
  * dgit build: Warn if --build-products-dir is not `..'.  Closes:#904859.
  * test suite: Test dgit import-dsc --build-products-dir.

  [Sean Whitton]
  * manpages: alioth->salsa
  * manpages: add references to pbuilder and cowbuilder
  * dgit-maint-gbp(7): discuss dgit.default.build-products-dir
  * dgit-maint-gbp(7): update references to --*-dirty
  * dgit-sponsorship(7): add references to push-source
  * dgit-maint-debrebase(7): fix command to just launder

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 29 Jul 2018 12:57:26 +0100

dgit (6.1) unstable; urgency=medium

  New feature:
  * 'pbuilder' and 'cowbuilder' subcommands (Closes: #844125).
    - Suggest sbuild | pbuilder | cowbuilder.

  Minor fixes:
  * Fix an error message to refer to the build products dir instead of
    just the parent directory.

 -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 28 Jul 2018 20:14:23 +0800

dgit (6.0) unstable; urgency=medium

  New features [Sean Whitton]:
  * Introduce dgit.default.build-products-dir git configuration key.
    Closes:#857316.
  * Die earlier, and with a more helpful message, if the user tries to
    include dirty changes when building a source package in split brain
    mode.

  dgit behavioural changes:
  * dgit: Always build the source package ourselves, rather than
    sometimes leaving that to the builder command.  dgit will now
    usually generate *_multi.changes rather than *_$arch.changes.
  * dgit: Build source packages in a private directory, except when
    the user passes --include-dirty [Sean Whitton].
    - dgit push-source no longer cleans the tree [Sean Whitton].
  * dgit: Rename --ignore-dirty to --include-dirty (leaving the old
    name supported as a deprecated alias).

  Test suite improvements:
  * test suite: unset VISUAL, which interferes.  Closes:#904308.
  * Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild
    tests.
  * Support tests/run-all --progressive.
  * Drop now-obsolete *-asplit tests.

  Other improvements:
  * apt-get method: when apt does not update release files,
    unconditionally print hint about noatime.  Closes:#851873.
  * messages: Be a lot more friendly about NEW in particular,
    and also add a couple of `please's.  Closes:#904448.
  * Make --build-products-dir (and the new config key) actually work.
    Closes:#863582.  [ Ian and Sean. ] 
  * dgit: Many important internal rearrangemnts relating to source
    package production and building.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 26 Jul 2018 14:43:47 +0100

dgit (5.10) unstable; urgency=medium
 
  * Merge the experimental branch.
  * test suite: Drop a couple of useless test log output lines.
  * infrastructure: Run git gc --auto before mirroring.  Closes:#841414.
 
 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 14 Jul 2018 18:07:02 +0100
 
dgit (5.9+exp4) experimental; urgency=medium

  * test suite: Use  dch -r -D sid ''  not  dch -r sid.  Closes:#903441.
  * test suite: Save a tarball of much of the working area of each test
    in $AUTOPKGTEST_ARTIFACTS.
  * Separate changelog entries for the following test attempts
    in experimental have been elided:
      dgit (5.9+exp3) experimental; urgency=medium
      dgit (5.9+exp2) experimental; urgency=medium
      dgit (5.9+exp1) experimental; urgency=medium

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jul 2018 13:45:07 +0100

dgit (5.9) unstable; urgency=medium

  * git-debrebase convert-from-gbp: Look for dgit-generated tags so we can
    usually make the new branch ff of the dgit view.  Closes:#903132.
  * git-debrebase convert-from-gbp: Check that the result will not
    count as having diverged.  This will usually turn failures to make
    the ff pseudomerge into -fdiverged.  Related to #903132.
  * git-debrebase, Dgit.pm, git: some internal reorganisation to
    support git-debrebase changes.
  * dgit-downstream-dsc(7): New manpage.  Closes:#842643,#851194.
  * git-debrebase(5): Document best gitk options.  Closes:#901927.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jul 2018 13:37:12 +0100

dgit (5.8) unstable; urgency=medium

  Bugfixes:
  * dgit, git-debrebase: Properly make patches even if an awkward
    .gitignore ignores the things in debian/patches.  Closes:#903130.
  * git-debrebase status: Fix commit reporting.  Closes:903131.
  * git-debrebase new-upstream: Add a -1 revision if the user
    didn't supply one.  Closes:#903127.
  * git-debrebase: Improve grammar if one blocking snag.
  * dgit(1): Unscramble push[-source] descriptions.  Closes:#903116.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 08 Jul 2018 11:42:41 +0100

dgit (5.7) unstable; urgency=medium

  New feature:
  * dgit checkout: new subcommand.  Closes:#878443.
  * dgit: Check that entirely-new uploads to Debian are not
    source-only-uploads, as those are REJECTed.  Closes:#801435.

  Bugfixes:
  * dgit(7): Mention git-debrebase and gbp pq alongside git-dpm,
    in the comment about handling patch stacks.
  * dgit update-vcs-git: Honour --package properly.
  * test suite: Always pass LC_COLLATE=C to sort(1).  Closes:#903006.
  * test suite: Fix trustingpolicy-replay & dput-ng.  Closes:#903007.
  * test suite: Test dput-ng compatibility.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 05 Jul 2018 15:02:21 +0100

dgit (5.6) unstable; urgency=medium

  * Merge the experimental branch containing the fianl
    version of the test suite gnupg workarounds.  Empirically,
      - The tests now pass (most of the time, at least) in
        current Debian unstable, whereas 5.5's fail utterly.
      - There is still occasional lossage.  So when running tests
        in a loop (eg to test ever commit), it is still good to set
        DGIT_TEST_RETRY_COUNT=3 (say).

  * test suite: Test that manpages format with only expected warnings.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 01 Jul 2018 00:41:20 +0100

dgit (5.5+exp9) experimental; urgency=medium

  * test suite: Explicitly start/stop the gnupg agent, around
    each call to gnupg.  Apropos of #902316 (and #868550).

  * Separate changelog entries for the following test attempts
    in experimental have been elided:
      dgit (5.5+exp8) experimental; urgency=medium
      dgit (5.5+exp7) experimental; urgency=medium
      dgit (5.5+exp6) experimental; urgency=medium
      dgit (5.5+exp5) experimental; urgency=medium
      dgit (5.5+exp4) experimental; urgency=medium
      dgit (5.5+exp3) experimental; urgency=medium
      dgit (5.5+exp2) experimental; urgency=medium
      dgit (5.4+exp1) experimental; urgency=medium

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 19:03:00 +0100

dgit (5.5) unstable; urgency=medium

  * Add missing comma in debian/control.  Closes:#902578.
  * dgit(1): Fix a wrong reference to \fp, which should be \fP.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 13:25:21 +0100

dgit (5.4) unstable; urgency=medium

  Improvements:
  * dgit(1): Better description of --overwrite.  Somewhat
    apropos of discussion in #902534.

  Bugfixes:
  * test suite: gdr-viagit, gdr-newupstream: Do not spuriously
    fail if gnupg not serendipitously installed.  Closes:#902559.
  * Fix bug ref to #865444 in previous changelog entry.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 27 Jun 2018 23:13:42 +0100

dgit (5.3) unstable; urgency=medium

  Bugfixes:
  * dgit: Do not introduce duplicate origs in .changes files,
    eg if the .changes already has that orig.  Closes:#869146.
  * Honour GIT_REFLOG_ACTION everywhere.  Closes:#901935.
  * git-debrebase new-upstream: Provide better reflog entries
    by setting GIT_REFLOG_ACTION.  Closes:#901925.

  Improvements:
  * Better message formatting when --overwrite may be needed,
    and a note about first dgit push in dgit(1).  Closes:891031.
  * dgit(7): Add discussion of quilt fixup error messages,
    and add cross-references to dgit(1) and the actual error.
    Somewhat apropos of #865444.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 27 Jun 2018 14:00:31 +0100

dgit (5.2) unstable; urgency=medium

  dgit bugfixes:
  * When all Debian changes vanish with single-debian-patch,
    do not fail to commit the patch queue removal.  Closes:#877036.
  * When build fails because the network is offline, mention
    that this is because --since-version was not specified.
    Closes:#883340.
  * When quilt fixup fails because of discrepancies, print a
    git diff rune which will show them.  Closes:#865446.
  * When fetch or push wants git fetch (other than in a situation where it
    happes to be a noop) but --dry-run was specified, fail with an
    explanation, rather than looping with a false coplaint about git
    fetch.  Closes:#871317.
  * --overwrite now no longer crashes if there is nothing to overwrite
    (eg, when used with --new).  Instead, it is simply ignored, as it is
    ignored in situations where the push is fast forward.  Closes:#863576.

  dgit/git-debrebase interop bugfixes:
  * git-debrebase interop: Add a missing debugcmd debugging print.
  * git-debrebase interop: Actually tolerate git-debrebase make-patches
    exiting with status 7.

  dgit vcs-git handling improvements:
  * Provide `update-vcs-git' subcommand, for creating and adjusting the
    vcs-git remote url.  Useful for transition from alioth to salsa.
    Closes:#902006.
  * Print a warning to stderr on `dgit fetch sid', if your vcs-git
    remote url disagrees with what's in sid's .dsc.

  documentation:
  * dgit(1): Mention under `dgit build' that it uses the network.
  * dgit(1): Clarify that --overwrite does nothing if not needed.
    Closes:#863578.
  * dgit-user(7): Recommend sbuild-debian-developer-setup.
    [ Sean Whitton. ]  Closes:895779.

  test suite:
  * Use nproc(1) rather than Sys::CPU.  This is more portable and does not
    depend on libsys-cpu-perl being installed.  Closes:888496.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 24 Jun 2018 23:33:28 +0100

dgit (5.1) unstable; urgency=medium

  dgit gitattributes handling:
  * Squash the working-tree-encoding attribute too.
  * Update an existing `dgit-defuse-attrs' macro in .git/info/attributes.
  * Test the working-tree-encoding attribute squashing properly.
    Closes:#901900.

  git-debrebase fixes:
  * new-upstream: fix (this time for sure) ff check handling
    of multi-piece upstreams.
  * Suppress gbp pq export output, except in case of error.
    Closes:#901809.
  * Manpages: Fix typos and etc.
  * Fix a typo in the package description.

  Test suite:
  * Triger ci.debian.net autopkgtests on: gnupg diffutils patch.
    (A dummy test is used to add to Testsuite-Triggers.)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 20 Jun 2018 23:20:57 +0100

dgit (5.0) unstable; urgency=low

  Major new facility:
  * git-debrebase, a new git workflow tool, in its own package.
  * dgit will now, when appropriate, check if it should call
    git-debrebase.

  [ Thanks to Sean Whitton for much useful input, and for
     dgit-maint-debrebase(7). ]

  dgit bugfixes:
  * Fix the exit status of programs in dgit.deb, to avoid the Perl
    misfeature which sometimes copies $! to the exit status.
  * When checking that the tree is clean, check the git index too.
  * In quilt_fixup_multipatch, work around git checkout paths
    not deleting files.  (Hypothetical bug AFAIAA.)
  * Respect --quilt=nofix even if single-debian-patch.

  dgit minor fixes:
  * "confess" when we die due to a warning, rather than symply dieing.

  Internal changes:
  * Move $playground global to dgit.
  * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm.
  * Changes to support git-debrebase.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 18 Jun 2018 00:29:44 +0100

dgit (4.4) unstable; urgency=high

  Test suite bugfix:
  * Use full key hash rather than short keyid.  Closes:#896653.
    [ report: Paul Gevers; fix: Chris Lamb ]

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 23 Apr 2018 13:18:51 +0100

dgit (4.3) unstable; urgency=high

  Documentation improvements:
  * dgit(7): Discuss file executability.  Closes:#886444.
  * dgit(7): Discuss git-unrepresentable properties of source trees.
  * dgit-maint-merge(7): Don't suggest using debian/source/patch-header
    for 1.0 source format.  Closes:#887850.  [Sean Whitton]

  Bugfixes:
  * dgit archive-api-query: Avoid crashing due to lack of $isuite.
    This breaks the infrastructure.  Closes:#886592.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 25 Jan 2018 00:33:56 +0000

dgit (4.2) unstable; urgency=low

  * Upload dgit 4.x series to unstable.

  New features [Sean Whitton]:
  * New 'push-source' subcommand for source-only uploads.  Closes:#848931
  * When dgit builds a source package, such as in the 'build-source'
    subcommand, it now bypasses dpkg-buildpackage and invokes dpkg-source
    directly.  This avoids a _source.buildinfo file in the .changes, which
    doesn't make sense when using dgit.  See
    <https://lists.debian.org/debian-dpkg/2017/06/msg00005.html>.

  Documentation improvements:
  * dgit(1): Add a bit more rationale (polemic, even).  Closes:#874221.
  * Recommend mk-build-deps rather than apt-get build-dep.
    Suggestion from Nikolaus Rath.  Closes:#863361.
  * dgit-maint-merge(7): many updates.  [Sean Whitton]
    Closes:#864873,#878433.
  * dgit-*(7): Mention first upload trick.  [Andrew Shadura,
    Sean Whitton]  Closes:#856402.

  Minor fixes:
  * When source discrepancy involves file mode changes, report them
    specially.  Closes:#886442.
  * In split brain mode, with unexpected diffs, print dgit view
    commitid in suggested diff rune.  (HEAD is wrong.)  Closes:#886443.
  * Fix message about missing quilt cache entry to refer to
    HEAD rather than tree, since dgit needs a commit.  Closes:#884646.
  * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
  * Remove some whitespace "errors". [Sean Whitton]

  Packaging:
  * Remove dependency alternative on realpath (package last existed in
    Debian wheezy).  Closes:#877552.

  Test suite:
  * dpkgsourceignores-docs: Correct restriction (so autopkgtest
    won't try to run it).
  * Additional workarounds for gnupg races (#868550) including
    retrying each individual test once, and more sophisticated
    wrapper for gpg (with locking and, sometimes saves stdin).
  * oldnewtagalt: Fix regression when running outside git tree,
    introduced in 4.1.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 07 Jan 2018 21:45:29 +0000

dgit (3.13) unstable; urgency=high

  Important bugfixes to dgit:
  * Add missing `use' for Dpkg::Compression et al.
    Thanks to report from Didier 'OdyX' Raboud.  (Closes:#879526.)

  Test suite:
  * Add missing `chiark-utils-bin' to Test-Depends.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 22 Oct 2017 17:51:12 +0100

dgit (4.1) experimental; urgency=medium

  Important improvements to dgit:
  * Support for `git worktree' worktrees.  There may still be
    bugs; the tests for this are not very comprehensive.  And
    worktrees on different filesystems may not work; that's a
    matter for the future.  Closes:#868515.
  * Change the dpkg-source -i argument to exclude exactly the right
    set of things.  (Sadly this is not a simple rune.)

  Other improvements to dgit:
  * New print-dpkg-source-ignores option to print the big rune
    you need to pass to dpkg-source to make it work exactly right.
  * Properly shell-quote the --git-builder argument to gbp.

  Documentation:
  * dgit-user(7): Provide information about how to use sbuild.
    Quite ugly due to #868527.  Closes:#868526.
  * dgit-user(7): Fixed example rune to use curl (which prints
    to stdout, as the rune expects).  [reported by Simon Tatham]

  Minor improvements:
  * Do not leave many clog-* files in .git/dgit.

  Internal changes:
  * using-these: New script to help with ad-hoc-testing.
  * Refactoring in preparation for push-source [Sean Whitton].

  Test suite:
  * sbuild-gitish: New test case to check running sbuild from git
  * Work around gnupg agent connection races by having our stunt
    gpg wrapper simply try running gpg again, once, if it exits 2.
    This does not fully suppress the bug but it does significantly reduce
    the probability.
  * Other tests for new features.
  * Various refactoring.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 14 Aug 2017 09:31:03 +0100

dgit (4.0) experimental; urgency=low

  * dgit: --deliberately-not-fast-forward works properly in
    split view quilt modes (suppressing the pseudomerge).

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 12 Feb 2017 22:22:31 +0000

dgit (3.12) unstable; urgency=high

  Important bugfixes to dgit:
  * Pass --no-renames to git diff-tree -z, avoiding potential trouble.
  * Defend against commit subject lines which would generate patches which
    look like series files, etc.  Involves adding .patch to all generated
    patch filenames.
  * dgit import: Defend against broken symlinks in ..
  * dgit import: Right error message for missing files in ..
  * dgit import: Avoid making broken symlinks in ..
  * quilt fixup: Tolerate deletion of executable files.
  * quilt fixup: Tolerate symlink creation (make patches).  Closes:#857382.

  Important bugfixes to other components:
  * dgit-repos-server: Do not reject commits with no author/committer
    email address (but still insist on date, and hence on the actual
    committer and author commit header fields).  Peter Green reports that
    eg 66c65d90db100435 in upstream linux.git is such a commit (and is
    accepted by github).  Closes:#863353.

  Test suite:
  * t-report-fail: print $PWD as part of failure message.
  * import-dsc: Test missing files, particularly in ..
  * run git gc on tests/worktrees/example_1.0.tar.
  * quilt fixup: Check we can delete files with funny modes
  * quilt fixup: Check that funny changes are represented properly

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Jul 2017 21:36:24 +0100

dgit (3.11~deb9u1) stretch; urgency=high

  * Rebuild and upload to stretch.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 11 Jul 2017 09:28:15 +0100

dgit (3.11) unstable; urgency=high

  Important bugfixes to dgit:
  * Fix rpush+buildinfo: Transfer buildinfos for signing.  Closes:#867693.
  * Cope if the archive server sends an HTTP redirect,
    by passing -L to curl.  Closes:#867185,#867309.
  * Cope with newer git which hates --local outside a tree.  Closes:#865863.
  * rpush: Honour local git config from build host working tree.
  * Tolerate compressor terminating with SIGPIPE.  Closes:#857694.
  * Honour more pre-tree git config options in our private trees sharing
    the user's object store.  In particular, core.sharedRepository.
    Prompted by #867603.
  * Clone multisuite works even without --no-rm-on-error.  Closes:#867434.
  * Work if "git init" does not create $GIT/info.  Closes:#858054.
  * Actually understand foo,-security (!)  Closes:#867189.

  Important bugfixes to other components:
  * dgit-badcommit-fixup: Honour core.sharedRepository.   Closes:#867603.
  * infrastructure: Cope with new git-receive-pack which has
    quarantine feature: ie, work around #867702.

  Test suite:
  * Cope with git restricting ext:: protocols.
  * multisuite: Test clone without --rm-on-error.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 08 Jul 2017 22:40:15 +0100

dgit (3.10) unstable; urgency=medium

  Bugfixes:
  * dgit: Copy several user.* settings from main tree git local config
    to dgit private workarea.  Closes:#853085.
  * dgit: Strip initial newline from Changes line from dpkg-parsechangelog
    so as to avoid blank line in commit messages.  Closes:#853093.
  * dgit: Do not fail when run with detached HEAD.  Closes:#853022.
  * dgit: Be much better about commas in maintainer changelog names.
    Closes:#852661.

  Test suite:
  * quilt-useremail: New test for user config copying (#853085).
  * lib-import-chk: Test that commits have smae authorship as appears in
    the changelog.  (Or, at least, the same authorship set.)
  * import-maintmangle: New test for changelog Maintainer mangling.

  Documentation:
  * Fix typos.  Closes:#853125.  [Nicholas D Steeves]

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 06 Feb 2017 17:49:39 +0000

dgit (3.9) unstable; urgency=medium

  Improvements:
  * dgit --overwrite: Check that the overwritten version's changelog entry
    is not UNRELEASED.  This could easily happen if this release was being
    made from a git branch which predates the previous package upload.

  Documentation:
  * dgit-maint-merge(7): Get git clone url right.  Closes:#852609.
  * dgit-maint-merge(7): Quote sample clone commands.  Closes:#852615.

  Test suite:
  * overwrite-chkclog: test UNRELEASED handling.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 25 Jan 2017 16:21:53 +0000

dgit (3.8) unstable; urgency=medium

  Bugfixes:
  * Make dgit-setup-* work in default distro.

  Test suite:
  * defdistro-setup: Test that setup-* functions distro selection works.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 23 Jan 2017 16:21:30 +0000

dgit (3.7) unstable; urgency=medium

  Bugfixes:
  * Fix clone-dgit-repos-server and print-dgit-repos-server-print-url.
    Closes:#851906.

  Documentation:
  * dgit-maint-merge(7): Explain when workflow is unsuitable
    (Closes:#852090) and improve the patch-header (Closes:#851897.)

  Internal changes:
  * New %.view target: `make dgit-maint-merge.7.view' runs `man -l ...'

  Test suite:
  * defdistro-dsd-clone-drs: New test which would have detected
    #851906 (and hopefully #850521).

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 22 Jan 2017 17:30:24 +0000

dgit (3.6) unstable; urgency=medium

  Bugfixes:
  * Actually use the url from a Dgit .dsc field naming an unknown distro.
    Closes:#851728.
  * Add dummy implementation of file_in_archive_aptget copied from
    file_in_archive_dummycat.  Re:#851697.   [ Peter Green ]

  Minor improvements:
  * Use `confess' to print a stack trace in a couple of internal error
    rcases.

  Infrastructure:
  * Properly honour NOCOMMITCHECK policy hook exit status.
    Closes:#851800.
  * Do not reject commits with no author/committer name (but still insist
    on email address and date).  Peter Green reports that eg
    71e128629ec786f3 in upstream xen.git is such a commit (and is accepted
    by github).  Closes:#851716.

  Test suite:
  * downstream-gitless: Test import of .dsc from unknown distro.
  * downstream-gitless: Test import of .dsc with unsafe url.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 19 Jan 2017 01:15:03 +0000

dgit (3.5) unstable; urgency=medium

  Bugfixes:
  * gitattributes: Defuse gitattributes in private working area even if we
    don't do it in the user's tree (because of user configuration).
  * gitattributes: When cloning, do not print spurious warning about
    actually-defused gitattributes.  Closes:#851624.
  * gitattributes: Improve comment left in .git/info/attributes.

  Test suite:
  * gitattributes: Many improvements to test case.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 17 Jan 2017 22:36:01 +0000

dgit (3.4) unstable; urgency=low

  Test suite:
  * drs-push-rejects: Set origin's url to an ad-hoc expression
    which produces the right ext:: rune, as dgit would.
    Closes:#851580.
  * Replace references to /home/ian in various worktrees with
    references to /nonexistent, to catch inadvertant accesses.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 16 Jan 2017 17:27:35 +0000

dgit (3.3) unstable; urgency=medium

  Behavioural changes to work around gitattributes file transformations:
  * Suppress file-transforming gitattributes in private work areas.
  * Configure suppression in user's trees in dgit clone and setup-new-tree.
  * Provide dgit setup-gitattributes to do this explicitly.
  * Documentation.

  Bugfixes:
  * dgit: Remove a leftover debugging print.
  * dgit: Set default dsc import distro when there is no Dgit field.
  * dgit: Set default dsc import distro when suppressing Dgit field.
  * dgit: Option parsing: Fix undefined $suite in some import-dsc.
    Closes:#851213.

  Packaging:
  * Remove redundant use of List::Util qw(any).  Closes:#851280.
  * Remove redundant Recommends on libtext-iconv-perl.

  Test suite:
  * Move default dsc distro config setting to lib.  We need this
    for the .dscs we have in tests/pkg-srcs/.
  * defdistro-import-dsc: Drop this test.
  * protocol-compat: check that we use the right distro
    information when importing.
  * Internal change: fix handling of nonempty distro=
  * gitattributes: New test for .gitattributes handling.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 16 Jan 2017 10:03:08 +0000

dgit (3.2) unstable; urgency=medium

  Bugfixes:
  * dgit: Do not execute END blocks in children.  So far symptoms of this
    bug seem to be limited to duplicated error messages but I have not
    done a thorough analysis.  Closes:#850052.
  * dgit-infrastructure: dgit-repos-policy-debian: Remirror a package when
    it becomes public (ie, make the repo available much more promptly when
    the package passes NEW).  Closes:#849789.
  * dgit: Fix a warning message about ref (mainly, tag) updates.

  Documentation:
  * dgit-maint-merge(7): Use git-deborig(1).
    [Sean Whitton]  Closes:#850953.
  * dgit-user(7): Fix some typos.

  Internals:
  * Fix a typo in a comment.

  Test suite:
  * infra: mirroring and policy hooks: Improve some debugging output.
  * infra: mirror-private: test that package becomes public.  (#849789)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jan 2017 02:11:34 +0000

dgit (3.1) unstable; urgency=medium

  Bugfixes:
  * dgit import-dsc: Do not crash with undefined $isuite.  Closes:#850781.
  * dgit build: Do not sometimes crash with undefined $isuite.
  * dgit: Do not nedlessly re-fetch the rewrite map.
  * dgit: After downloading .debian.* files, save them in `..', too
    (ie do this not just for .origs).
  * dgit: When fetching, refetch files with hash mismatches (and save them
    as `...,fetch'), so we can distinguish them from any built locally.
    Closes:#850824.

  Test suite:
  * Add test for import-dsc with default distro.  (Detects #850781.)

  Administrivia:
  * Fix a dgit 3.0 changelog bullet referring to refs/dgit-fetch/DISTRO.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 10 Jan 2017 17:50:27 +0000

dgit (3.0) unstable; urgency=medium

  Protocol change:
  * Dgit: field now records the nominal distro name, and a hint
    for a tag and url where the git objects (including any rewrite
    map) can be fetched.
  * Use this information, where provided.  Closes:#850431.

  Bugfixes:
  * dgit config handling: Honour command-line and context-provided
    suite and distro more reliably and consistently.
  * Parsing of extended Dgit fields by import-dsc was broken;
    and is now fixed even for more-extended ones.
  * dgit clone-dgit-repos-server uses readonly access.
    Closes:#850521.
  * fetch and pull ignore the changelog suite when it is UNRELEASED.
    Closes:#848646.
  * dgit-badcommit-fixup: Do not investigate symrefs.  Closes:#850547.

  Minor new feature:
  * distro alias facility in config space.  (Primarily for testing.)
  * Undocumented --config-lookup-explode= feature.  (For testing.)
  * Provide `dgit print-dgit-repos-server-source-url'.  Re:#850521.
  * Honour dgit-distro.*.default-suite and dgit.default.default-suite.

  Other improvements:
  * Improve debugging output a bit.
  * Use refs/dgit-fetch/DISTRO rather than refs/dgit-fetch/SUITE,
    which leads to less duplication and so less clutter.
  * Enforce a reasonable syntax for nominal distro names.
  * When generating orig+debian/patches view, copy debian/ from
    HEAD.  This makes less noise in diffs.  Closes:#850095.

  Docuentation [Sean Whitton and Ian Jackson]:
  * dgit-sponsorship(7): Use --no-dep14tag.  Closes:#849105.
  * dgit-maint-merge(7): Use debian/source/patch-header.  Closes:849120.
  * dgit(7): Updated `trouble' section to suggest having dpkg-source
    delete the autotools output (with a patch if necessary).
  * dgit(1): Several minor updates and fixes.  Closes:#850519.

  Test suite:
  * Internal improvements.
  * badcommit-rewrite: Fix operation using installed version of fixup.
  * Arrange to pass --debug-quick-random to gpg-agent.
  * Strip block count out of find -ls output - it is unstable!
  * gbp-orig: Add a missing -m, without which git would run an
    editor if stdout was a tty (!)
  * Add t-stunt-parsechangelog to a few tests which were missing it.
  * Tests for the new protocol feature.
  * Fail tests if we look up any configuration relating to Debian.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 09 Jan 2017 16:43:10 +0000

dgit (2.16.2) unstable; urgency=low

  dgit-badcommit-fixup: 
  * Fix crash when running for 2nd time in bare repo.
  * In --check mode, exit with status 2 if things are not fine.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 07 Jan 2017 13:31:50 +0000

dgit (2.16.1) UNRELEASED; urgency=low

  * dgit-badcommit-fixup: New mode --check which is readonly.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 07 Jan 2017 13:04:49 +0000

dgit (2.16) unstable; urgency=low

  Dealing with fallout from #849041:
  * Provide dgit-badcommit-fixup history-rewriting script.
  * New rewrite map feature, which allows dgit git server to adjust
    clients' interpretation of Dgit fields, so that history-rewriting is
    effective.  (Feature is only partially implemented right now -
    enough to dig current Debian users out of the hole.)  Re:#850431.

  Test suite:
  * New test case for history-rewriting.
  * Change `local foo=$(bar)' idiom to `local foo; foo=$(bar)' since
    the former does not trip set -e even if bar fails :-(. 

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 06 Jan 2017 20:46:30 +0000

dgit (2.15) UNRELEASED; urgency=high

  Infastructure:
  * Prevent introduction of new commits which lack `committer'
    information.  Ie, prevent the reception of new commits afflicted by
    #849041.  Existing commits are tolerated.

  Test suite:
  * Be much stricter about messages from git-fsck.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 05 Jan 2017 18:20:23 +0000

dgit (2.14) unstable; urgency=critical

  CRITICAL BUGFIX:
  * Do not generate bogus commits with --overwrite or import-dsc.
    Closes:#849041.

  Test suite:
  * Run a lot of git-fsck.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 04 Jan 2017 22:52:55 +0000

dgit (2.13) unstable; urgency=high

  Changed behaviour:
  * quilt fixup: Permit creation of patches which delete files, by psssing
    --include-removal to dpkg-source, and tolerating it when we do our
    quilt fixup analysis.  dpkg-source has supported this since at least
    stretch.  Closes:#848901.

  Error messages:
  * Improve "cannot represent change" message: print the git old and new
    modes too.

  Bugfix:
  * Import: Switch back to unpa branch on patch import iterations.
    In particular, do not fail utterly if dpkg-source and gbp disagree.
    Closes:#848843.

  Documentation [Sean Whitton]:
  * dgit-maint-gbp(7): Remove reference to closed bug.  Closes:#848725.
  * dgit-sponsorship(7): Update in light of fixed #844129.  Closes:#848789.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 21 Dec 2016 01:32:41 +0000

dgit (2.12) unstable; urgency=high

  Changed behaviours:
  * By default, generate a DEP-14 tag as well as a dgit archive/*
    tag, even in non-split-view quilt modes.  Closes:#844129.
  * Version tags mangling: Protect dots, as per proposed update to DEP-14.

  Documentation:
  * dgit-maint-merge(7): Explain how to change to this workflow
    from an existing git workflow.  [Sean Whitton]  Closes:#847807.
  * dgit-maint-native(7): Clarify that we mean native source format.
    [Phil Hands]  Closes:#847987.

  Error messages:
  * Slightly better message when .dsc not found.  Apropos of #844128.
  * Give better advice if .dsc/.changes signing fails: if no changes
    are needed to the package, user may indeed just debsign and dput.
    Closes:#844131.
  * Produce better error reporting when absurd git wrapper fails
    on a patch during .dsc import.  Apropos of #848391.

  Bugfixes:
  * If we cannot hardlink origs into our extraction area, use symlinks
    instead.  Closes:#844570.
  * Suppress some leftover debugging output from import-dsc.
    Closes:#847658.
  * Do not fail when cloning a package containing dangling symlinks.
    Closes:#848512.
  * Do not fail to import a .dsc containing patches which patch files
    multiple times, due to #848611.  Closes:#848391.
  * Do not fail to import a .dsc containing patches to .git/ (!)
  * infra: dgit-repos-policy-debian which broke due to recent git setting
    GIT_ALTERNATE_OBJECT_DIRECTORIES in the pre-receive-hook.
    (fixes test suite regression in stretch).

  Test suite:
  * Provide and use stunt lintian and debuild, to avoid lintian
    complaining about our stupid test packages.
    (fixes test suite regression in stretch).

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 19 Dec 2016 17:35:18 +0000

dgit (2.11) unstable; urgency=medium

  Documentation:
  * dgit-user(7): Better explanation of combined suites (comma syntax).
    Thanks to Sean Whitton for review and suggestions.
  * dgit(1), dgit(7): Better reference docs for combined suites.
  * dgit(1): Improve formatting of rpush section.

  Test suite:
  * Replace make in Test-Depends with build-essential.  Most of the tests
    do in fact run dpkg-buildpackage which bombs out if build-essential is
    missing.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 08 Nov 2016 22:41:29 +0000

dgit (2.10) unstable; urgency=medium

  New features:
  * Support the Debian *-security suites.
  * New comma-separated multiple-suite merging facility (readonly),
    so that users can easily track "jessie, or jessie-security".
  * dgit-user(7): Suggest `dgit clone P jessie,-security'.

  Bugfixes:
  * Cope when an orig tarball is a tarbomb.  Ie, if it contains
    other than one single directory toplevel.  Closes:#843422.
  * Actually honour the branch name, if we are on dgit branch, to specify
    the suite, as documented in the manpage.
  * When cloning a distro which has no git server, correctly leave
    the user on the local dgit branch, not on `master'.
  * Fix an unconditional print that was supposed to be a printdebug:
      origs <blah>.orig.tar.gz f.same=1 #f._differ=-1
  * Print a slightly better message if .git found in orig tarball(s).

  Test suite:
  * Test suite: Add fakeroot and make to Test-Depends.  These aren't
    necessarily pulled in by anything else.  (dpkg-dev Recommends
    build-essential.  But we don't actually need build-essential.)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 08 Nov 2016 01:08:51 +0000

dgit (2.9) unstable; urgency=medium

  New features:
  * During push, automatically calculate which .origs are required,
    so user never needs [--ch:]-sa or [--ch:]-sd.  Closes:#829116.
  * New import-dsc feature.
  * New option --dgit-view-save= for split view quilt modes.
    In particular, means that the output of a split view quilt-fixup
    is left somewhere useful.
  * dgit clone: Set timestamps in cloned tree to a single unified time.
    This makes it less likely that the user will trip over any
    timestamp-dependent FTBFS bugs (eg #842452).
  * Support dgit --delayed= push (with a warning in the manpage
    about possible skew).
  * dgit gbp-build will arrange to let gbp buildpackage generate
    .orig tarballs if it seems applicable.  Closes:#841094.

  Documentation improvements:
  * dgit-*(7).  Many new tutorial manpages, several written and many
    improved by Sean Whitton.
  * dgit(7): Substantial updates, including documenting split view.
  * dgit(1): Better cross-references.
  * dgit(1): Remove obsolete workflow information.
  * dgit(1): Improved BUGS section.
  * Fix changelog entry for SIGPIPE to correctly mention
    Closes:#841090.

  Bugfixes:
  * Split brain mode: Fix --new.  Closes:#842577.
  * Properly look for .origs etc. in .., fetching them less often.
    Closes:#842386.
  * Reject `dgit pull' in split view quilt modes, to avoid
    creating unfortunate wreckage on non-dgit-view branches.
    Closes:#842608.
  * Cope when cloning suite which doesn't receive uploads,
    like testing.  Closes:#842621.
  * Properly fetch all archive dgit view tags, as we intended.
  * Actually provide a -p (--package=) option (!)

  Test suite fixes:
  * Test suite: Explicitly configure user.name and user.email, so
    that tests work when environment doesn't have defaults.
    Closes:#842279 (I hope).

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 31 Oct 2016 12:47:18 +0000

dgit (2.8) unstable; urgency=medium

  * When in split build mode for `gbp-build' or `build', run
    mergechanges as is required.  Closes:#841990.
  * Test suite: build-mode-*: Check that right .changes comes out
    (detects #841990).
  * Defend against debian/patches/series being an unusual object, in case
    dpkg-source doesn't, in absurd git-apply fallback.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 25 Oct 2016 17:29:23 +0100

dgit (2.7) unstable; urgency=medium

  Absurd bugfix for serious bug:
  * Work around `git-apply' problems (eg #841865, #829067) exposed by
    `gbp pq import' (#841866) by sometimes falling back to an emulation of
    git-apply in terms of dpkg-source --before-build.  Closes:#841867.

  Minor changes:
  * dgit(1): Reorder the options, moving more important ones earlier.
  * dgit(1): Some more info about --deliberately.
  * Provide various --force-something options.  Please don't use them.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 24 Oct 2016 02:37:28 +0100

dgit (2.6) unstable; urgency=medium

  Fixes to HTTP handling:
  * Check for non-2xx HTTP status codes from ftpmaster api server.
  * Always honour --curl= and --curl:.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 23 Oct 2016 14:57:22 +0100

dgit (2.5) unstable; urgency=low

  Substantive changes:
  * Do not crash in split brain quilt modes when the two brains are
    actually identical.  (Eg --quilt=gbp with no patches.)  Closes:#841770.
  * Switch to new archive/ tag format by default, even in
    non-split-brain mode.
  * Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.

  Documentation:
  * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.

  Test suite:
  * Introduce setup/gnupg, to help work around gnupg2 bug #841143
    and improve performance by amortising gnupg migration cost.
  * Various bugfixes.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 23 Oct 2016 13:20:23 +0100

dgit (2.4) unstable; urgency=low

  Bugfixes:
  * split brain cache: Fix a wrong implicit reference to $_.
    Closes:#841383.
  * split brain cache: Make sure to write reflog entries for cache updates
    even if the eventual tree (and therefore commit) is the same.
    Otherwise, after updating dgit, the cache might have the right answer
    but not be refreshed even by a build.
  * dgit gbp-build: No longer invent a --git-debian-branch option.
    Usually the user is a maintainer using split brain, and we should rely
    on their own gbp configuration to specify the right check.
    Closes:#841100.

  Minor docs fix:
  * dgit(1): Document which --ch: options are a good idea.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 20 Oct 2016 16:31:54 +0100

dgit (2.3) unstable; urgency=low

  * With --overwrite, do not check all sorts of tags (which may
    not exist, or might contain wrong things).  Closes:#841101.
  * When generating pseudomerge in quilt split brain mode due to
    --overwrite, actually include the version number in the commit
    message.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 18 Oct 2016 01:58:05 +0100

dgit (2.2) unstable; urgency=low

  * Fix config relating to Debian to actually make split brain mode
    work.  Closes:#841085.
  * Detect SIGPIPE (and SIGCHLD) being blocked or ignored.
    Closes:#841090.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 17 Oct 2016 17:31:18 +0100

dgit (2.1) unstable; urgency=low

  * Do not crash due in clone to failure to handle dpkg-parsechangelog
    SIGPIPE.  Closes:#840989.  Avoids:
       dgit: failed command: dpkg-parsechangelog --format rfc822 --all
       dgit: subprocess died due to fatal signal PIPE
  * git- prefixes: Fix some occurrences of `git-foo' in infrastructure,
    messages, and test suite.  Filter out .../git-core from PATH in
    test suite so that we catch future occurrences.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Oct 2016 19:05:14 +0100

dgit (2.0) unstable; urgency=low

  Incompatible change:
  * dgit sbuild: does not pass -A to sbuild.  Consequently the default
    build is now simply sbuild's default.  With older sbuilds it was
    possible to override dgit's -A by passing another option.  But this
    has been changed recently and now this default setting is very awkward
    to change for the dgit user.
  * dgit gbp-build: Make --quilt=gbp the default.  (See below.)
  * New tag format (for dgit view) archive/debian/VERSION.

  Major new feature:
  * --quilt=gbp, --quilt=dpm, --quilt=unpacked: Introduce facility for
    split view (dgit/mainiainer view), to improve compatibility with some
    workflow tools.

  New checks and improved behaviours in dgit:
  * When running dpkg-buildpackage, cope if user specified -g or -G.
  * dgit sbuild: check that the set of .changes files found is as we
    expect, before calling mergechanges.  Re:#800060.
  * dgit sbuild: Rename the used-up .changes files to `.inmulti' to
    avoid accidental use of the wrong one (by software, or by users).
  * dgit sbuild: Check that the binary .changes file doesn't contain a
    .dsc.
  * Introduce --rm-old-changes to delete previous builds' changes files.
  * Remove any pre-existing _source.changes file before building source,
    as a safety check.
  * No longer tolerate a multitude of .changes files when doing push.
    Instead, insist on a single one.  Closes:#800110.
  * dgit sbuild no longer deletes extranious .changes files; instead
    we rely on --rm-old-changes, or failing that, fail early.
  * When doing quilt linearisation, treat upstream .gitignores not
    in the toplevel the same way we treat ones in the toplevel.
  * When automatically generating quilt patch, honour GIT_COMMITTER_DATE
    for filename creation (makes filename deterministic in test suite).
  * New --overwrite option, replaces need to for user to use
    git merge -s ours.  Closes:#838718.
  * When generating quilt patches from git commits, make patches that
    look quite like git-format-patch output (rather than strange things
    based on an obselete interpretation of DEP-3).
  * When generating quilt patches from git commits, honour (and strip)
    any Gbp-Pq headers (that we understand).
  * Several dgit-generated commits now have slightly better annotations
    from dgit about what it was doing.
  * Before committing to push, check that .dsc and .changes correspond.
    Closes:#800060.
  * Better error message if non-split-brain patch stack no longer
    applies (due to new upstream version, or user messing with it).
    Closes:#833025.
  * Better error message if HEAD contains changes unrepresentable
    by `3.0 (quilt)'.  Closes:#834618.
  * Much better error message when HEAD and .dsc do not match.
    Closes:#809516.

  Infrastructure:
  * dgit-repos-policy-debian: Better error handling.
  * dgit-repos-policy-debian.: fix git-cat-file-handling with multiple
    taints in db (!).
  * dgit-infrastructure has, and uses, its own copies of the perl modules.
    This avoids introducing a versioned dependency between dgit and
    dgit-infrastructure (and also makes it easier to test cross-version
    compatibility).

  Documentation:
  * Document the dgit-distro.DISTRO.quilt-mode config setting.
  * Clarify the --clean= options' documentation.  Closes:#800054.
  * Discourage use of the --PROGRAM:OPTION escape hatch.  (Apropos
    of various bug reports including #800060 and #833025.)
  * Document the expected form of HEAD for each --quilt= mode.

  Bugfixes:
  * When cleaning up after failed clone, stat the to-be-cleaned-up
    directory before running rmtree on it.  Closes:#796773.
  * Do not call "warn" on failure of cleanup handler in END block
    (since warn has been made fatal and aborts the cleanup chain).
  * Print better error message (with `fail' rather than `die') if
    `dgit clone' cannot create the destination directory.
  * Properly substitute $changesfile in one of the `You can retry'
    messages.  Closes:#800078.
  * Pass --ch:* and -v options to dpkg-buildpackage when building
    source.  Fixes bad Perl poetry syntax.  Closes:#829121.
  * When synthesing a commit from a .dsc from the archive, stop
    internal git reset from printing a confusing message about HEAD.
  * Turn off git gc in the private working areas.
  * Do not fail to do some important quilt processing in some
    --quilt modes.
  * Fix two calls to chdir without proper error checking.
  * Fix a couple of bugs in error reporting.
  * Fix several bugs in .orig detection/recognition.
  * Tidy up refs/dgit-fetch/ after dgit fetch (if successful).
  * Fix handling of in-archive copies.
  * Don't break if user has push.followTags=true.  Closes:#827878.
  * Arrange for the special dgit remote to be skipped by git fetch --all
    etc.  And no longer configure a fetch spec, since it won't work
    anyway.  Closes:#827892.
  * Allow local git config options to override user-global ones,
    as is proper.  Closes:#835858.
  * When generating patch filenames from titles, first transliterate
    them (lossily) to ascii.  Closes:#834807.

  Test suite:
  * When sbuild fails, do not crash due to sed not finding the log
    file.  Instead, simply tolerate the absence of the log file.
  * Put --no-arch-all in build-modes-sbuild act, not only its real_act.
    Cosmetic change only.
  * Set GIT_COMMITTER_DATE and GIT_AUTHOR_DATE and increment them
    explicitly in drs-push-rejects test.  This avoids date dependencies
    which can cause that test to fail on fast computers.
  * Remove some spurios .debs from the example_1.0.tar.
  * Increase sqlite_busy_timeout in debpolicy-dbretry, because old
    zealot is very slow and we need to give the other processes time
    to rollback and release the lock.
  * Test quilt single-debian-patch.
  * Provide `tartree-edit gitfetchinfo' etc. to help with comparing
    different test case git working tree tarballs.
  * Test dgit-repos-policy-debian with multiple (identical, as it happens)
    existing taints.
  * Provide better log output for certain failures.
  * Many new tests (especially for new functionality).
  * Add missing debhelper (>=8) to test suite's global Depends.
  * tstunt arrangements: Fix mishandling of PERLLIB, etc.
  * tstunt-parsechangelog: Produce Timestamp field (like official one
    does, now).
  * Do not fail when git requires --allow-unrelated-histories.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Oct 2016 12:12:50 +0100

dgit (1.4) unstable; urgency=high

  Bugfixes:
  * Unbreak --dry-run (`exiting subroutine via next', broken in
    ac221d67, bug released in 0.22).
  * When running git-add in commit-quilty-patch, properly escape
    filenames (which git-add treats as glob patterns).
  * When running git-add in commit-quilty-patch, use -f and sometimes -A,
    so as to avoid being broken by any .gitignore, etc.
  * When quilt linearisation fails, print the right information in
    the error message.  (This has been broken forever.)
  * Cope properly with `3.0 (quilt)' with single-debian-patch.
    Closes:#796016.  (Still does not work with wheezy's dpkg-source, so
    no test case yet.)
  * With dgit sbuild, pass our -d before the user's arguments, so that
    the user can override it.  Closes:#796019.

  New checks and improved behaviours:
  * Detect and reject git trees containing debian/source/local-options
    or debian/source/local-patch-header.
  * In --dry-run mode, _do_ actually run dpkg-source --commit so that we
    actually do construct the quilt fixup commit; instead, honour
    --dry-run by avoiding pulling it back to your HEAD.
  * quilt-fixup checks that the git tree is clean, as for build-prep.

  Documentation:
  * In dgit(7), discuss binaries and documentation present in upstream but
    removed by rules clean.

  Test suite:
  * Run quilt-fixup with -wgf in distropatches-reject,
    so that we don't need build-depends.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 22 Aug 2015 15:31:02 +0100

dgit (1.3) unstable; urgency=high

  Important bugfixes:
  * In option parser test `@ARGV' not `length @ARGV'.  Closes:#795710.
  * Properly quote package name when constructing regexp in
    complete_file_from_dsc.  Closes:#795736.  Also, grep the code for
    likely similar problems elsewhere and improve a (harmless) instance in
    dgit-repos-server.

  Other improvements:
  * If a .orig in .. is a symlink, hardlink the link target into our
    private unpack directory, rather than the link itself (since latter
    won't work if the symlink is relative).  Closes:#795665.
  * Test suite: Fix t-restriction-x-dgit-schroot-build in non-adt mode.
  * Infrastructure: Improve an error message in dgit-repos-policy-debian.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Aug 2015 17:51:02 +0100

dgit (1.2) unstable; urgency=high

  Improvements:
  * Honour *.clean-mode configuration setting for --clean= mode.
  * No longer require option values to be cuddled: support `--opt val' and
    `-o val'.  Closes:#763332.

  Manpages:
  * Fix typos.
  * Document that tags are in DEP-14 format, and that they
    are used for authenticating pushes.
  * Correct cross-reference to point to browse.d.d.o.
  * Move dgit.default.* to main CONFIGURATION section.

  Administrivia:
  * Add missing close of #793060 to changelog for version 1.1.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 14 Aug 2015 18:27:20 +0100

dgit (1.1) unstable; urgency=medium

  Bugfixes:
  * When source package contains things called .git (even files, and even
    in subdirectories), remove them.  Closes:#793671.
  * Work around curl -sS -I printing `HTTP/1.0 200 Connection established'
    before the actual header, so dgit works with https_proxy set (!)
  * --new is needed for read access to packages in NEW, too.  Document
    this, and make it work properly.
  * Work around #793471 (madness with $SIG{__WARN__} and Perl's system
    builtin): move $SIG{} setting into setup_sigwarn in Dgit.pm, and
    check getppid.
  * When invoking git-buildpackage via dgit gbp-build, consider our
    command line arguments when massaging the dpkg-buildpackage arguments,
    so that we don't end up giving dpkg-buildpackage contradictory
    instructions.
  * Cope with new git-buildpackage which provides gbp, rather than the
    eponymous command, on PATH.

  Configurability:
  * Honour dgit-distros.DISTRO.cmd-CMD and .opts-CMD.  Closes:#793427.
  * Make configuration able to prevent dpkg-mergechangelogs setup.
  * Provide dgit setup-new-tree (like dpkg-setup-mergechangelogs
    but only does it if not disabled in config).
  * Set up git user.email and user.name from distro access config
    or DEBEMAIL/DEBFULLNAME.  Closes:#793410.
  * When key to use not specified any other way, use the debian/changelog
    trailer line.  Closes:#793423.
  * Honour --git= (mostly).

  Documentation:
  * Fix some manpage typos.  [ Richard Hartmann ]
  * Manpage said that --clean=check was -wn but that is --clean=none;
    correctly document that --clean=check is actually -wc.
  * Document that up to -DDDD (not just -DD) is meaningfully different.
  * Document that -cname=value applies only for this run.
  * Improve manpage comment about defining a new distro.
  * Document that --quilt=linear is the default for Debian.
  * Fix a formatting problem in --build-products-dir= doc.
  * In manpage, do not seem to imply that NMU should be of only one
    new commit.
  * Qualify to Debian the manpage comment about how to do NMU.
  * In discussion on how to start using dgit when already using git, do
    not imply/assume that existing git history will have identical trees
    to dgit history.
  * Remove stray sentence in config section of manpage.
  * Manpage: Clarify wording of readonly config.
  * Manpage: Better cross-references for -k and keyid.
  * dgit(7): No longer say that dgit-repos lives on Alioth.

  Improvements:
  * Introduce more sophisticated protocol negotiation for rpush.
  * Do not quote `:' in shellquote.
  * Print a supplementary message when push fails, giving advice to
    the user about how to retry.  Closes:#793144.
  * Slurp in entire git config, for better performance.
  * Rename `git-build' operation to `gbp-build' to make it clearer what
    it's for.  Keep the old name as an alias.
  * Show `dgit sbuild' in usage message.
  * When we are using dpkg-buildpackage to clean before using it to also
    do the build, let it do its cleaning thing as part of its run, rather
    than running it twice.  When we are _not_ supposed to be using
    dpkg-buildpackage to clean, but we are running it to do the build,
    pass -nc.  Closes:#793060.
  * Also suppress spurious runs of the clean target when building using
    git-buildpackage.
  * When exec fails, always print the program name in the error message.

  Infrastructure:
  * Infrastructure: Get mirroring right for fresh repos of existing
    packages (!)

  Packaging, cleanups, debugging and test suite:
  * Fix Vcs-Git and Vcs-Browse to refer to chiark.  (The dgit-repos on
    alioth aren't suitable right now because the master there can
    currently only be updated with an actual upload, ie dgit push.)
  * Make warnings fatal in dpkg-repos-admin-debian, dgit-ssh-dispatch
    (using setup_sigwarn).
  * tstunt/dpkg-parsechangelog: Make warnings fatal (directly).
  * tstunt/dpkg-parsechangelog: Do not complain if PERLLIB is empty.
  * Test suite: Honour DGIT_TEST_DEBUG=''.
  * With -DDDD, print out all gitcfg references (copious!)
  * Fix a debug message in the obsolete sshpsql archive access driver.
  * Test suite: More automatic enumeration of tests.
  * Test suite: Provide tests which check that all our various build
    operations run the right targets as expected (ie, that we are massaging
    the arguments to dpkg-buildpackage, and suppressing our clean target,
    etc., correctly).

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 27 Jul 2015 16:34:31 +0100

dgit (1.0) unstable; urgency=medium

  Improvements:
  * Switch to new production git repositories for reading.
    (this can no longer divert to alioth).  Public readonly access
    now works.  Closes:#791447.
  * Memoise git config lookups (big speedup!)
  * Provide -wdd aka --clean=dpkg-source-d.  Closes:#792433.
  * Provide -wc aka --clean=check.

  Manpage updates:
  * Remove some obsolete caveats from BUGS.
  * Reorganise and complete the configuration section.
  * Remove obselete comment about DMs not being able to push.
    We have, for now, a way to add keys manually.  Closes:#720173.

  Access machinery:
  * Remove configuration relating to alioth.
  * Provide for different access mechanisms when pushing.
  * Provide for configurable git url suffix.
  * Allow git-url to be '' to force fallback to git-proto etc.
  * Provide for checking git presence via http[s].
  * Do some quoting on debug output (needed if the server might not
    be trustworthy and might send us bad stuff).
  * Talk to push.dgit.debian.org, rather than the .debian.net alias.

  Infrastructure:
  * Provide for mirroring git updates to a different server.
  * Provide cgit-regen-config command for cgi-grnet-01.
  * Make dgit-ssh-dispatch not spew (harmless) warnings if caller
    tries for a shell session (ie SSH_ORIGINAL_COMMAND not set).

  Cleanups:
  * Remove an obsolete comment from the code.
  * Improve an error message from dgit-repos-policy-debian.
  * Test suite: Break out t-make-hook-link.
  * Fix a manpage typo.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 19 Jul 2015 22:15:53 +0100

dgit (0.30) unstable; urgency=high

  INCOMPATIBLE CHANGES:

  * Client uses new infrastructure:
    - Check for new dgit git service on dgit-git.debian.net (ie
      gideon.debian.org), with transition plan based on diversion feature.
      Closes:#720172.
    - Old versions of dgit will stop working when the server-side handle is
      pulled.

  * dgit git trees no longer contain .pc for format `3.0 (quilt)' source
    packages.  Closes:#764606.
    - It is deleted whenever we find it.
    - Older versions of dgit will choke on trees without .pc.
    - (When doing quilt fixup, we recreate a suitable .pc in a temporary
      directory so that we can do dpkg-source --comit.)

  * All users are urged to upgrade ASAP.

  Other significant improvements:

  * When generating quilt patches, try to linearise the git history into a
    series of individual new patches for debian/patches.  Closes:#770710.

  * When receiving a push with dgit-repos-server, update the server's
    refs/heads/master if we are pushing to what the distro regards as a
    relevant branch, and the push would ff master.  Closes:#728209.

  * For non-Debian distros, distro version release tags contain distro
    name a la DEP-14 (rather than hardcoding `debian/').

  * Set up a merge driver for debian/changelog.  Closes:#769291.

  * --clean=git and --clean=none cause dgit to pass -nc to
    dpkg-buildpackage, suppressing calls to the package's clean target.
    Also, expand the documentation in this area slightly.  Closes:#768590.

  * Provide --clean=git-ff (aka -wgf), which is useful for dgit itself (!)

  Minor improvements:

  * Reduce some noise output and improve the clarity of some messages.
  * Be more careful about tag updates during fetch: only update tags
    referring to uploads to distro we are trying to fetch from.
  * Change realpath dependency to `coreutils (>= 8.23-1~) | realpath'
    (Closes:#786955.)

  Bugfixes:

  * Fix handling of rmadison-based and gitless distros (e.g., Ubuntu).
  * Add missing `gpgv' to test dependencies in debian/tests/control.
  * Strip `-b <branch>' from contents of Vcs-Git header, when setting up
    the vcs-git remote.  Closes:#759374.
  * Do not offer wget as an alternative dependency to curl.  We always
    unconditionally invoke curl and have no code to use wget.
    Closes:#760805.
  * Complain about lack of cuddled values for value-taking single-letter
    options, rather than thinking the user meat an empty value.
    Closes:#763332.
  * Reject (rather than ignoring) further options merged witth -wn, -wg,
    -wd.
  * Fix inaccurate error message when archive's git hash is not an
    ancestor of git repo's git hash.
  * Detect and bomb out on vendor-specific `3.0 (quilt)' patch series.
  * Fix the rules clean target to remove test results and output.

  Documentation improvements:

  * Break out dgit(7) from dgit(1).
  * Provide example workflow for dgit rpush.  Closes:#763334.
    (Also part of the fix for #768470.)
  * Document that dgit repos are cloneable with git, in dgit(1)
    section MODEL.  [Andreas Barth.]  Closes:#768470.
  * Better documentation for quilt series handling.
  * Document under `dgit push' that it is best to build with dgit too.
    Closes:#763333.
  * Other minor clarifications and improvements.

  Behind-the-scenes work:

  * Use ftpmasterapi archive query method.
    (Closes:#727702.  Also partly obsoletes #768470.)
  * New dgit-infrastructure binary package containing dgit-repos-server et
    al.  Client users probably don't want this stuff.  Also, it provides a
    convenient way to publish the dependencies.
  * Many many bugfixes to the server side (dpkg-repos-server et al.).
  * Add :..; prefix to ssh remote commands, for the benefit of future
    forced command wrappers.  Implicitly, this defines a new ssh-based
    command protocol.  Closes:#720174, #720175.
  * Distro access configuration handling changes (should not be noticeable
    to most users).
  * In places, significant restructuring or tidying up.
  * Turn all perl warnings into errors using $SIG{__WARN__}.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 Jul 2015 01:34:55 +0100

dgit (0.22.1) unstable; urgency=high

  * Use Dpkg::Version::version_compare everywhere, not
    Dpkg::Version::version_compare_string.  The latter is entirely wrong,
    meaning that dgit would get many version comparisons wrong.
    Closes:#768038.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 04 Nov 2014 12:46:40 +0000

dgit (0.22) unstable; urgency=medium

  Bugfixes:
  * Clone removes destination directory on error.  Closes:#736153.
  * Work with wheezy-backports (and keep squeeze-backports working too).
    Closes:#736524.
  * Work in read-only no-git-history mode with Ubuntu.  You still have
    to pass -dubuntu.  Closes:#751781.
  * Use mirror.ftp-master.debian.org DNS alias rather than coccia.
    Closes:#752602.
  * Check hashes of files ourselves rather than running dget to
    re-retreive the .dsc.
  * Check SHA-256 of .dsc against hash from archive_query (ie projectb)
    rather than letting dpkg-source do a signature verification.
    Closes:#737619.  Closes:#737625.
  * Treat .dsc as bytes, just like everything else, rather than letting
    HTTP::Message convert it to a Perl unicode string which the rest of
    the program mishandles.  Closes:#738536.

  Minor improvements:
  * Include canonicalised suite name in signed tag message.
  * Mention cross-version dgit rpush incompatibility in manpage.
  * Check for rpush protocol version incompatibility and crash early
    if incompatible.
  * New script tests/using-intree for running tests on the source tree.
  * Do not spew diff output to terminal (by default).  Print sensible
    message instead.  Closes:#736526.
  * Print better message for lack of configuration settings.
  * Document that dgit rpush needs gnupg and your public key on the build
    host.  Closes:#736529.
  * Fix a manpage reference to `--dget=' where `--dgit=' was intended.
  * Provide t-archive-process-incoming and t-archive-query subroutines for
    regression test scripts to use.
  * Print better message for unknown operations.
  * Provide `dgit clean'.  Closes:#736527.
  * When cloning, set up a remote `vcs-git' from the package's Vcs-Git
    (and put an appropriate caveat in the manpage).  Closes:#740687.
    Closes:#740721.
  * Improve error message for .dsc having already been signed (iff
    using libdpkg-perl 1.17.x).  Closes:#731635.
  * Improve error message for .dsc parsing failures more generally.
  * Better reporting of child exit statuses (esp. deaths due to signals).
  * In rpush, on protocol error talking to build host, check if the
    subprocess died and report differently if so.  Closes:#736528.
  * Fixed a manpage typo.
  * When tests invoke dgit, use --dgit= so that subprocesses use our
    dgit rather than system one.
  * Add a test for dgit rpush.

  Major new feature, currently stalled awaiting server infrastructure:
  * dgit-repos-server: New program for receiving signed-tag-based
    pushes.  Corresponding support in dgit itself, but not currently
    used by default for any distro.
  * Bring forward push of the version tag ref so it happens alongside
    the push of the suite branch ref.
  * New git-check and git-create methods "true" which are no-ops.
  * test-dummy-drs `distro': for testing dgit and dgit-repos-server.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 19 Aug 2014 11:24:02 +0100

dgit (0.21) unstable; urgency=medium

  Bugfixes relating to unclean trees:
  * Run a clean (of the specified type) before any build operation; do
    this with `dpkg-buildpackage -T' clean if necessary, so -wd now works
    with all the building methods.
  * Refuse to do quilt fixup (explicitly requested, or as a result of
    build) if the tree contains ignored files.  Closes:#731632.

  Error message improvements:
  * Use failedcmd to report errors when ssh psql fails.  Closes:#734281.
  * failedcmd prints $us, not $_[0] - ie, dgit doesn't pretend,
    in the error message, to be its child.
  * Do not report the (irrelevant) $? when madison parsing fails.

  Better workflow flexibility:
  * Provide --build-products-dir option (and corresponding semantics
    for -C) to specify where to find the files to upload.  Closes:#731633.

  Support for Debian backports suites:
  * New quirks infrastructure in configuration and internals,
    for suites (or perhaps distros) which are a bit like others.
  * Use correct default archive location.
  * Compute "-v" option default value correctly.
  * Closes:#733954.

  Packaging improvement:
  * Add `Testsuite: autopkgtest' to debian/control.  (This will only have
    the right effect with recent enought dpkg; it will generate a harmless
    warning with earlier versions of dpkg.)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 19 Jan 2014 02:14:25 +0000

dgit (0.20) unstable; urgency=high

  * Use newest (not oldest) version currently in suite when calculating
    what value to use for -v<version> by default.  Closes:#732781.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 21 Dec 2013 19:13:56 +0000

dgit (0.19) unstable; urgency=low

  Testing facilities:
  * Provide "test-dummy" distro with "dummycat" access method.
  * Provide a selection of autopkgtest (DEP-8) tests.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 27 Nov 2013 18:27:17 +0000

dgit (0.18.2) unstable; urgency=high

  Bump archive upload urgency to high.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 24 Nov 2013 17:42:57 +0000
dgit (0.18.1) unstable; urgency=low

  Bugfixes:
  * sshpsql archive query method passes LANG=C.  Closes:#729788.
  * Subcommand program or argument options containing hyphens work.
    (Eg, --dpkg-buildpackage:blah was previously incorrectly rejected.)

  Packaging fixes:
  * Depend on dput.
  * Depend on curl | wget, as dget needs one of those.  (The dput package,
    which contains dget, doesn't require them because dput itself works
    without.)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 24 Nov 2013 17:36:03 +0000

dgit (0.18) unstable; urgency=low

  Major new feature:
  * Remote push (dgit rpush), a la debsign -r.  Closes:#721185.

  Improved behaviours:
  * dgit build, by default, uses the archive to find out what the correct
    -v<version> option is to pass to dpkg-genchanges.  Closes:#727200.
  * Abolish the sshdakls method and replace it with sshpsql: that is, ssh
    (to coccia, by default) and run sql commands on the ftpmaster
    database.  This is faster and has fewer bugs but is vulnerable to db
    schema changes.  Closes:#726955.  Closes:#720170.  Closes:#720176.
  * When generating git tags, quote the (uncanonicalised) changelog's
    Distribution field as the suite.
  * Command execution reports from --dry-run go to stderr.

  Other new features:
  * Support --gpg=... to provide a replacement command for gpg.
  * Support --ssh=... and --ssh:... to affect how we run ssh.

  Bugfixes:
  * When using sbuild, pass the arguments to mergechanges in the right
    order so that we use the correct Description (the _source one,
    not the one from sbuild which didn't get e.g. -v<version>).
  * push actually takes an optional suite, like it says in the synopsis.
    Closes:#727125.
  * Fix dgit --damp-run sbuild to actually work.
  * Fix the "shellquote" internal subroutine.  The bugs in it ought not to
    have caused any real trouble in previous versions of dgit.

  Documentation and message fixes:
  * manpage: Clarify comments about orig tarballs.  Closes: #723605.
  * manpage: Remove comment in BUGS about lack of policy docs
    for Dgit field, which is specified now.  Closes:#720201.
  * manpage: Make discussion of --existing-package less scary.  The
    default archive access method no longer needs it.  Closes:#720171.
  * Mention "git merge", not "git-merge", in helpful message.
    Closes:#725632.

  Internal and debugging improvements:
  * Report chdir actions in debugging output.
  * Improvements to implementation of --dry-run and --damp-run.
  * Some code motion and cleanups.

  Note: changelog entries for the following versions, which were uploaded
  to Debian experimental, have been collapsed into this single entry:
    0.18~experimental2 0.18~experimental1
    0.17~experimental7 0.17~experimental6 0.17~experimental5
    0.17~experimental4 0.17~experimental3 0.17~experimental2
    0.17~experimental1
    0.16~experimental3 0.16~experimental2 0.16~experimental1
  We do describe here all the changes since 0.17.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 09 Nov 2013 10:12:13 +0000

dgit (0.17) unstable; urgency=high

  * Do not grobble around in .git/refs/; instead, use git-show-ref.
    This avoids breaking when git makes packed refs.  Closes:728893.
  * Clarify error message for missing refs/remotes/dgit/dgit/<suite>.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 07 Nov 2013 00:02:47 +0000

dgit (0.16) unstable; urgency=high

  * Format `(3.0) quilt' fixup does not mind extraneous other files
    in the build tree (e.g., build products and logs).  Closes: #727053.
  * Set autoflush on stdout, to get better ordering of debugging
    etc. output when stdout is redirected.
  * New --damp-run mode, for more convenient and fuller testing etc.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 22 Oct 2013 13:06:54 +0100

dgit (0.15) unstable; urgency=low

  * Better handling of packages pushed using dgit and stuck in NEW.
    (And, use of `--new' is not needed with fetch.)  Closes: #722199.
  * More comprehensive warnings in many cases of archive skew.
  * Implement `dgit help' as well as `--help'.  Closes: #721661.
  * Provide `dgit version' and `--version'.  Closes: #721654.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Sep 2013 00:14:05 +0100

dgit (0.14) unstable; urgency=low

  * Include package name in tag message.
  * Create directory .git/dgit when needed during build.  Closes: #721428.
  * Add Vcs-Git and Vcs-Browser [Richard Hartmann].  Closes: #721404.
    These fields refer to the development branch, "master", on alioth,
    not to the dgit suite refs (which are not accessible to git clone).

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 01 Sep 2013 18:30:44 +0100

dgit (0.13) unstable; urgency=low

  * Reuse already-downloaded .orig files after checking their hashes.
    Closes: #720526.  (This introduces a dependency on Digest::SHA.)
  * Do not always pointlessly fetch the .dsc twice.  (That code was
    erroneously duplicated during editing, apparently.)
  * Remove DGET_UNPACK from the environment in case the user has set it.
  * Remove scary warning from Description.
  * When uploading to Debian, tell dput to upload to "ftp-master".  This
    avoids problems with derivatives whose dput has a different default.
    Closes: #720958.
  * Fix some bugs in dgit fetch --dry-run which made dgit push
    --dry-run often not work at all.
  * Update the local tracking branch for the dgit remote, when pushing.
    Closes: #720956.
  * Fix references in manpage to old Vcs-Dgit-Master field name.
  * Reorganise manpage sections to be in a more conventional order.
  * New manpage section on FILES IN THE SOURCE PACKAGE BUT NOT IN GIT.
    Closes: #721186.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 29 Aug 2013 00:27:23 +0100

dgit (0.12) unstable; urgency=low

  * Cope with packages with epoch.  Closes: #720897.
  * Improve error message for non-fast-forward push.  Closes: #720896.
  * New --ignore-dirty option to skip noncritical check.  Closes: #720895.
  * New --no-quilt-fixup option to suppress quilt fixup.  RTFM.
  * Add Closes line for #720595 to changelog entry for 0.11.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 26 Aug 2013 16:50:39 +0100

dgit (0.11) unstable; urgency=low

  * Location of dgit-repos is now git.debian.org:/git/dgit-repos/repos.
    Closes: #720525.  The rename on the server side will break older
    versions of dgit.
  * Fix bug which would make quilt patch fixup fail if git status
    produced "M" lines.
  * Autogenerated quilt patch fixup patch Description contains several
    recent git commits, rather than implying that the patch corresponds
    exactly to the top git commit.
  * Use "ftp.debian.org" not "http.debian.net" as the default Debian
    archive.  (http.debian.net tends to defeat certain kinds of cacheing,
    and can also have more skew.)
  * dgit build uses dpkg-buildpackage; there is a dgit git-build
    for using git-buildpackage.  Closes: #720595.
  * Better error message for use of UNRELEASED suite.  Closes: #720523.
  * Do not canonicalise suite more than once.  Related to: #720526.
  * Fix a badly open-coded copy of check_not_dirty.  Closes: #720524.
  * Fix some bugs in building (eg build-source would fail to do the quilt
    fixup; the --clean check in build was wrong).
  * Add missing dependency on realpath.
  * git-build (git-buildpackage wrapper) does not bother canonicalising
    the suite if --git-ignore-branch is used.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 25 Aug 2013 17:00:43 +0100

dgit (0.10) unstable; urgency=low

  * Create .pc/applied-patches - do not empty it (!)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 25 Aug 2013 00:51:50 +0100

dgit (0.9) unstable; urgency=low

  * New cleaning arrangements.
  * More comprehensive workaround for `3.0 (quilt)'.
  * In push, double-check the .changes against the changelog.
  * Better error when source package contains .git.  Closes: #720555.
  * Change our .dsc field name to `Dgit'.  Relevant to #720201.
  * Fix bug handling our synthetic merges when we see them in
    the remote suite branch.
  * `3.0 (quilt)' fixup creates .pc/applied-patches since modern
    dpkg-source creates it even though old ones didn't always.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 24 Aug 2013 18:49:02 +0100

dgit (0.8) unstable; urgency=low

  * Fix comparison of archive's .dsc's hash and git branch head
    to DTRT.
  * When creating repos in dgit-repos (using the ssh-cmd method),
    copy _template rather than using mkdir and git init.
    Closes: #720522.
  * In push, do git fetch as well as archive fetch, or archive
    fetch can fail.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 23 Aug 2013 12:24:09 +0100

dgit (0.7) unstable; urgency=low

  * If dak ls, or rmadison, reports multiple versions, look for them
    all, and pick the newest .dsc that doesn't give 404.
  * Manpage formatting fix.
  * Name the local remote tracking branch remotes/dgit/dgit/<suite>
    so that we avoid a warning from git about ambiguous branch names.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 22 Aug 2013 18:29:10 +0100

dgit (0.6) unstable; urgency=low

  * Allow fetching when archive has out-of-date git hash in .dsc.
    Closes: #720490.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 22 Aug 2013 16:02:10 +0100

dgit (0.5) unstable; urgency=low

  * Upload to unstable, as this version mostly works.  (All the RC
    bugs of which I'm aware are now properly represented in the BTS.)

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 22 Aug 2013 15:38:00 +0100

dgit (0.4~pre2) experimental; urgency=low

  * Mangle debian/<version> tags the way git-buildpackage does
    (as of git-buildpackage 0.5.5, 3c6bbd0f4992f8da).
  * Support dgit-distro.<distro>.keyid config option.
  * Revert change to ssh to alioth CNAME, as the recommended CNAME
    is to something with no write access to the fs and the new CNAME
    has not yet been set up.  This reintroduces #720172 :-/.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 22 Aug 2013 15:31:17 +0100

dgit (0.4~pre1) experimental; urgency=low

  * Use dgit.debian.net vhost on alioth.  Closes:#720172.
  * Usage message.  Closes:#720085.
  * Provide "dgit sbuild".
  * Assorted manpage fixes and improvements.
  * Fail if a required config item is missing.
  * Much better error messages.
  * Better error checking when parsing RFC822-style control data.
  * Better checking that the supplied .dsc and debian/changes correspond.
  * Ordering improvement in push: don't add dsc field until git push done.
  * New --distro option (helps with unknown suites).
  * Bugfixes.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 22 Aug 2013 13:36:44 +0100

dgit (0.3) experimental; urgency=low

  * New version which appears to be able to sort of work at least
    some of the time.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 17 Aug 2013 09:18:04 +0100

dgit (0.2) experimental; urgency=low

  * New version which might actually work but probably won't.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 16 Aug 2013 16:52:17 +0100

dgit (0.1) experimental; urgency=low

  * Initial experimental (partial) version.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 15 Aug 2013 12:09:01 +0100