Your message dated Sun, 16 Oct 2016 11:34:10 +0000 with message-id <e1bvjhi-0002dk...@franck.debian.org> and subject line Bug#838718: fixed in dgit 2.0 has caused the Debian Bug report #838718, regarding dgit: should suggest --allow-unrelated-histories to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 838718: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838718 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: dgit Version: 1.4 Severity: normal Tags: patch With recent git, the user needs to pass --allow-unrelated-histories to `git merge` when merging in an upload not made with dgit. Patch attached. -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (900, 'testing') Architecture: i386 (i686) Kernel: Linux 4.5.0-2-686-pae (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages dgit depends on: ii ca-certificates 20160104 ii coreutils 8.25-2 ii curl 7.50.1-1 ii devscripts 2.16.7 ii dpkg-dev 1.18.10 ii dput 0.10.3 ii git [git-core] 1:2.9.3-1 ii libdpkg-perl 1.18.10 ii libjson-perl 2.90-1 ii libperl5.22 [libdigest-sha-perl] 5.22.2-5 ii libwww-perl 6.15-1 ii perl 5.22.2-5 Versions of packages dgit recommends: ii openssh-client [ssh-client] 1:7.3p1-1 Versions of packages dgit suggests: ii sbuild 0.71.0-2 -- no debconf information -- Sean WhittonFrom 8f3074f978d70d3aa2e63a91611229ee6d05e025 Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Fri, 23 Sep 2016 14:18:38 -0700 Subject: [PATCH] suggest --allow-unrelated-histories Needed with recent git. --- dgit | 2 +- dgit.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index e02a6bd..e744f41 100755 --- a/dgit +++ b/dgit @@ -2226,7 +2226,7 @@ END fail "dgit push: HEAD is not a descendant". " of the archive's version.\n". "dgit: To overwrite its contents,". - " use git merge -s ours ".lrref().".\n". + " use git merge --allow-unrelated-histories -s ours ".lrref().".\n". "dgit: To rewind history, if permitted by the archive,". " use --deliberately-not-fast-forward"; } diff --git a/dgit.1 b/dgit.1 index 926a9c6..842cc9e 100644 --- a/dgit.1 +++ b/dgit.1 @@ -611,7 +611,7 @@ plus appropriate diffs and cherry picks from the dgit remote tracking branch, construct a git commit whose tree corresponds to the tree to use for the next upload. If that commit-to-be-uploaded is not a descendant of the dgit remote tracking branch, check it out and say -.BR "git merge -s ours remotes/dgit/dgit/" \fIsuite\fR; +.BR "git merge --allow-unrelated-histories -s ours remotes/dgit/dgit/" \fIsuite\fR; that tells git that we are deliberately throwing away any differences between what's in the archive and what you intend to upload. Then run -- 2.9.3
Description: PGP signature
--- End Message ---
--- Begin Message ---Source: dgit Source-Version: 2.0 We believe that the bug you reported is fixed in the latest version of dgit, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 838...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Ian Jackson <ijack...@chiark.greenend.org.uk> (supplier of updated dgit package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Sun, 16 Oct 2016 12:12:50 +0100 Source: dgit Binary: dgit dgit-infrastructure Architecture: all source Version: 2.0 Distribution: unstable Urgency: low Maintainer: Ian Jackson <ijack...@chiark.greenend.org.uk> Changed-By: Ian Jackson <ijack...@chiark.greenend.org.uk> Closes: 796773 800054 800060 800078 800110 809516 827878 827892 829121 833025 834618 834807 835858 838718 Description: dgit - git interoperability with the Debian archive dgit-infrastructure - dgit server backend infrastructure Changes: 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. Checksums-Sha1: ee8d01fdd0c738eaa8cb6e5e2119a14231c67ca1 1283 dgit_2.0.dsc 7e2e0cf4ecde5c3466d821aff414efb97f90c315 341103 dgit_2.0.tar.gz 608f3fc831f5d5c338b995b85f19300030cfb06b 39352 dgit-infrastructure_2.0_all.deb b096a88d8fb9262065d79d8d5eba489c2e53cc16 79030 dgit_2.0_all.deb Checksums-Sha256: d79dfdebf4cf57e74c9430b1ab7e9dabb9f07088a9c63f89626831027fe7be93 1283 dgit_2.0.dsc 6def67de4c029f9238a5d512a4504be272c10b698548768498382aa275895f25 341103 dgit_2.0.tar.gz be92cb4013e9f369ad4fbad13d06bd828a7b37202ee31b84e306e46c8e18cd7e 39352 dgit-infrastructure_2.0_all.deb 70df4f0986abfbb210bff28a03df8b8818846d3b3f0e642ebc3f2f207b2f25e9 79030 dgit_2.0_all.deb Files: 29ad75b33a518bea326653d16d1ba2b3 1283 devel optional dgit_2.0.dsc db0216e966ee899de37b02c543a9ef40 341103 devel optional dgit_2.0.tar.gz 3ec8eadc1d11767e0cdbccf99d2ec80f 39352 devel extra dgit-infrastructure_2.0_all.deb 85986a70c88c847f466aabd96c7e185a 79030 devel optional dgit_2.0_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBCAAGBQJYA2H0AAoJEOPjOSNItQ05Wn0IALbY9OKpar1q3M91DSaHkfS3 Y2YT3za0WKY2QEYuNFFwJkNl8EORheWu4uRdACNcHO+RTl/siNsp4UIUBCcW39fe 2ZyjWEUn0f5QY0O8ErJBEIHB+FUR7X8xI39/s2DzSrZRPvUYXd9ZbPJN9O8IksnI E0NuMlrrTXUzzbH2s1qeJpz0h6EIJvy0hHYRBxYoenUENsDvrNWl8qdbnV2PqSVt OVSQuLdE2ZBubr8IhPuB5zjWYDDraOLyOxAiK5ekthyuU8hkok3gA/Q+DkLg1Ldc LCn3QBVw22l41PPpab+k1gCXyYjO/3SiKwkLC6ipLa29ADSCWIPIcJ7uksl6Lvg= =WvbB -----END PGP SIGNATURE-----
--- End Message ---