Bug#850196: unblock: dgit/2.14
Package: release.debian.org
Severity: grave
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package dgit
dgit 2.13 has a HIDEOUS bug which causes it to generate malformed git
commits. (#849041) To my surprise, extreme disappointment, and soon
everyone's annoyance, nothing in git (not even the usual git server
code) detected this.
Everyone who is using dgit 2.x must upgrade to 2.14 immediately.
The changes from 2.13 to 2.14 are:
* The changelog.
* The fixes for the two occurrences of this bug.
* Changes to the test suite which I think will avoid any further
bugs of this kind.
The test suite changes are textually large and hard to review, but:
This is a DEP-8 test suite and it is not run during build, so it
cannot cause a FTBFS bug. Furthermore, I have (of course) run it:
both in its ad-hoc mode on stretch and done a formal full-on adt-run
in a sid schroot. It passes (provided I work around the existing bug
#840673 in dput).
I will attach the output of
debdiff dgit_2.{13,14}.dsc >dgit_2.13-2.14.debdiff
debdiff --exclude=test dgit_2.{13,14}.dsc >dgit_2.13-2.14.exclude-test.debdiff
Under the circumstances I hope you agree I have chosen the right
severity for this bug.
unblock dgit/2.14
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
diff -Nru dgit-2.13/debian/changelog dgit-2.14/debian/changelog
--- dgit-2.13/debian/changelog 2016-12-21 01:32:41.000000000 +0000
+++ dgit-2.14/debian/changelog 2017-01-04 22:52:55.000000000 +0000
@@ -1,3 +1,14 @@
+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:
diff -Nru dgit-2.13/dgit dgit-2.14/dgit
--- dgit-2.13/dgit 2016-12-20 21:34:21.000000000 +0000
+++ dgit-2.14/dgit 2017-01-04 22:11:08.000000000 +0000
@@ -3538,7 +3538,7 @@
parent $dgitview
parent $archive_hash
author $authline
-commiter $authline
+committer $authline
$msg_msg
@@ -5944,10 +5944,14 @@
progress "Import, merging.";
my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
my $version = getfield $dsc, 'Version';
+ my $clogp = commit_getclogp $newhash;
+ my $authline = clogp_authline $clogp;
$newhash = make_commit_text <<END;
tree $tree
parent $newhash
parent $oldhash
+author $authline
+committer $authline
Merge $package ($version) import into $dstbranch
END
diff -Nru dgit-2.13/tests/lib dgit-2.14/tests/lib
--- dgit-2.13/tests/lib 2016-12-19 17:32:27.000000000 +0000
+++ dgit-2.14/tests/lib 2017-01-04 22:11:07.000000000 +0000
@@ -349,6 +349,25 @@
esac
}
+t-git-fsck () {
+ git fsck --no-dangling --strict
+}
+
+t-fscks () {
+ (
+ shopt -s nullglob
+ for d in $tmp/*/.git $tmp/git/*.git; do
+ cd "$d"
+ t-git-fsck
+ done
+ )
+}
+
+t-ok () {
+ t-fscks
+ echo ok.
+}
+
t-rm-dput-dropping () {
rm -f $tmp/${p}_${v}_*.upload
}
diff -Nru dgit-2.13/tests/setup/examplegit dgit-2.14/tests/setup/examplegit
--- dgit-2.13/tests/setup/examplegit 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/setup/examplegit 2017-01-04 22:11:07.000000000 +0000
@@ -50,4 +50,4 @@
t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p"
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/setup/gnupg dgit-2.14/tests/setup/gnupg
--- dgit-2.13/tests/setup/gnupg 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/setup/gnupg 2017-01-04 22:11:07.000000000 +0000
@@ -12,4 +12,4 @@
t-setup-done 'GNUPGHOME' 'gnupg'
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/absurd-gitapply dgit-2.14/tests/tests/absurd-gitapply
--- dgit-2.13/tests/tests/absurd-gitapply 2016-11-08 20:40:18.000000000 +0000
+++ dgit-2.14/tests/tests/absurd-gitapply 2017-01-04 22:11:07.000000000 +0000
@@ -13,4 +13,4 @@
cd $p
grep moo moo
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/build-modes dgit-2.14/tests/tests/build-modes
--- dgit-2.13/tests/tests/build-modes 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/build-modes 2017-01-04 22:11:07.000000000 +0000
@@ -32,4 +32,4 @@
bm-act-iterate
done
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/build-modes-gbp dgit-2.14/tests/tests/build-modes-gbp
--- dgit-2.13/tests/tests/build-modes-gbp 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/build-modes-gbp 2017-01-04 22:11:07.000000000 +0000
@@ -36,4 +36,4 @@
bm-act-iterate
done
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/build-modes-sbuild dgit-2.14/tests/tests/build-modes-sbuild
--- dgit-2.13/tests/tests/build-modes-sbuild 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/build-modes-sbuild 2017-01-04 22:11:07.000000000 +0000
@@ -15,4 +15,4 @@
bm-guess-e-source-e-targets "$act"
bm-act-iterate
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/clone-clogsigpipe dgit-2.14/tests/tests/clone-clogsigpipe
--- dgit-2.13/tests/tests/clone-clogsigpipe 2016-11-08 20:40:23.000000000 +0000
+++ dgit-2.14/tests/tests/clone-clogsigpipe 2017-01-04 22:11:07.000000000 +0000
@@ -7,4 +7,4 @@
t-dgit clone $p
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/clone-gitnosuite dgit-2.14/tests/tests/clone-gitnosuite
--- dgit-2.13/tests/tests/clone-gitnosuite 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/clone-gitnosuite 2017-01-04 22:11:07.000000000 +0000
@@ -7,3 +7,5 @@
cp -a $tmp/git/_template $dgitrepo
t-dgit clone $p
+
+t-ok
diff -Nru dgit-2.13/tests/tests/clone-nogit dgit-2.14/tests/tests/clone-nogit
--- dgit-2.13/tests/tests/clone-nogit 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/clone-nogit 2017-01-04 22:11:07.000000000 +0000
@@ -22,4 +22,4 @@
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/clone-reprepro dgit-2.14/tests/tests/clone-reprepro
--- dgit-2.13/tests/tests/clone-reprepro 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/clone-reprepro 2017-01-04 22:11:07.000000000 +0000
@@ -30,4 +30,4 @@
t-refs-same-start
t-refs-same refs/remotes/dgit/sid,stable refs/remotes/dgit/sid
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/debpolicy-dbretry dgit-2.14/tests/tests/debpolicy-dbretry
--- dgit-2.13/tests/tests/debpolicy-dbretry 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/debpolicy-dbretry 2017-01-04 22:11:07.000000000 +0000
@@ -64,4 +64,4 @@
t-policy-admin list-taints | tee $tmp/taints-list | grep $autotaint
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/debpolicy-newreject dgit-2.14/tests/tests/debpolicy-newreject
--- dgit-2.13/tests/tests/debpolicy-newreject 2016-12-19 15:53:12.000000000 +0000
+++ dgit-2.14/tests/tests/debpolicy-newreject 2017-01-04 22:11:07.000000000 +0000
@@ -118,4 +118,4 @@
'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
t-dgit push
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/distropatches-reject dgit-2.14/tests/tests/distropatches-reject
--- dgit-2.13/tests/tests/distropatches-reject 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/distropatches-reject 2017-01-04 22:11:07.000000000 +0000
@@ -78,4 +78,4 @@
expect-fail-distro-series DEB_VENDOR \
t-dgit clone $p
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/drs-push-masterupdate dgit-2.14/tests/tests/drs-push-masterupdate
--- dgit-2.13/tests/tests/drs-push-masterupdate 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/drs-push-masterupdate 2017-01-04 22:11:07.000000000 +0000
@@ -47,4 +47,4 @@
push_and_check +HEAD:master
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/drs-push-rejects dgit-2.14/tests/tests/drs-push-rejects
--- dgit-2.13/tests/tests/drs-push-rejects 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/drs-push-rejects 2017-01-04 22:11:07.000000000 +0000
@@ -191,4 +191,4 @@
prep_dm_mangle ''
mustsucceed $push_spec # succeeds
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/dsd-clone-drs dgit-2.14/tests/tests/dsd-clone-drs
--- dgit-2.13/tests/tests/dsd-clone-drs 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/dsd-clone-drs 2017-01-04 22:11:07.000000000 +0000
@@ -13,4 +13,4 @@
cd drs-cloned
ls -al infra/dgit-repos-server
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/fetch-localgitonly dgit-2.14/tests/tests/fetch-localgitonly
--- dgit-2.13/tests/tests/fetch-localgitonly 2016-11-08 20:43:13.000000000 +0000
+++ dgit-2.14/tests/tests/fetch-localgitonly 2017-01-04 22:11:07.000000000 +0000
@@ -17,4 +17,4 @@
t-cloned-fetched-good
t-has-ancestor $old
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/fetch-somegit-notlast dgit-2.14/tests/tests/fetch-somegit-notlast
--- dgit-2.13/tests/tests/fetch-somegit-notlast 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/fetch-somegit-notlast 2017-01-04 22:11:07.000000000 +0000
@@ -12,4 +12,4 @@
t-cloned-fetched-good
t-has-ancestor debian/3-1
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/gbp-orig dgit-2.14/tests/tests/gbp-orig
--- dgit-2.13/tests/tests/gbp-orig 2016-12-19 17:32:27.000000000 +0000
+++ dgit-2.14/tests/tests/gbp-orig 2017-01-04 22:11:07.000000000 +0000
@@ -74,4 +74,4 @@
cd $tmp
diff -ruN gbp-output/tar-x tar-x
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/gitconfig dgit-2.14/tests/tests/gitconfig
--- dgit-2.13/tests/tests/gitconfig 2016-11-08 20:46:51.000000000 +0000
+++ dgit-2.14/tests/tests/gitconfig 2017-01-04 22:11:07.000000000 +0000
@@ -35,4 +35,4 @@
t-dgit -cdgit.default.clean-mode=none clean
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/import-dsc dgit-2.14/tests/tests/import-dsc
--- dgit-2.13/tests/tests/import-dsc 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/import-dsc 2017-01-04 22:11:07.000000000 +0000
@@ -96,4 +96,4 @@
t-expect-fail 'signature check failed' \
t-dgit import-dsc --require-valid-signature $dsc2 +$branch
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/import-native dgit-2.14/tests/tests/import-native
--- dgit-2.13/tests/tests/import-native 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/import-native 2017-01-04 22:11:07.000000000 +0000
@@ -66,4 +66,4 @@
lastv_imp=$this_imp
done
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/import-nonnative dgit-2.14/tests/tests/import-nonnative
--- dgit-2.13/tests/tests/import-nonnative 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/import-nonnative 2017-01-04 22:11:07.000000000 +0000
@@ -14,4 +14,4 @@
# 3.0 (quilt), single-debian-patch, one orig
t-import-chk sunxi-tools 1.2-2.~~dgittest
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/import-tarbomb dgit-2.14/tests/tests/import-tarbomb
--- dgit-2.13/tests/tests/import-tarbomb 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/import-tarbomb 2017-01-04 22:11:07.000000000 +0000
@@ -46,4 +46,4 @@
tar zvcf ../$orig .
mangle2
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/inarchivecopy dgit-2.14/tests/tests/inarchivecopy
--- dgit-2.13/tests/tests/inarchivecopy 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/inarchivecopy 2017-01-04 22:11:07.000000000 +0000
@@ -76,4 +76,4 @@
copy-check 2.1 testing
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/mirror dgit-2.14/tests/tests/mirror
--- dgit-2.13/tests/tests/mirror 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/mirror 2017-01-04 22:11:07.000000000 +0000
@@ -77,4 +77,4 @@
t-check-mirrored
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/mirror-debnewgit dgit-2.14/tests/tests/mirror-debnewgit
--- dgit-2.13/tests/tests/mirror-debnewgit 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/mirror-debnewgit 2017-01-04 22:11:07.000000000 +0000
@@ -22,3 +22,5 @@
t-dgit build
t-dgit push
t-check-mirrored
+
+t-ok
diff -Nru dgit-2.13/tests/tests/mirror-private dgit-2.14/tests/tests/mirror-private
--- dgit-2.13/tests/tests/mirror-private 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/mirror-private 2017-01-04 22:11:07.000000000 +0000
@@ -23,4 +23,4 @@
t-check-not-mirrored
t-files-notexist $reposmirror/$p.*
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/mismatches-contents dgit-2.14/tests/tests/mismatches-contents
--- dgit-2.13/tests/tests/mismatches-contents 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/mismatches-contents 2017-01-04 22:11:07.000000000 +0000
@@ -21,4 +21,4 @@
t-expect-fail 'debian/TRASH' \
t-dgit push --new
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/mismatches-dscchanges dgit-2.14/tests/tests/mismatches-dscchanges
--- dgit-2.13/tests/tests/mismatches-dscchanges 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/mismatches-dscchanges 2017-01-04 22:11:07.000000000 +0000
@@ -31,4 +31,4 @@
t-dgit -wgf push --new
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/multisuite dgit-2.14/tests/tests/multisuite
--- dgit-2.13/tests/tests/multisuite 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/multisuite 2017-01-04 22:11:07.000000000 +0000
@@ -54,4 +54,4 @@
t-has-parent-or-is HEAD $rcombined
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/oldnewtagalt dgit-2.14/tests/tests/oldnewtagalt
--- dgit-2.13/tests/tests/oldnewtagalt 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/oldnewtagalt 2017-01-04 22:11:07.000000000 +0000
@@ -21,5 +21,5 @@
test-push "newtag $count"
done
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/orig-include-exclude dgit-2.14/tests/tests/orig-include-exclude
--- dgit-2.13/tests/tests/orig-include-exclude 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/orig-include-exclude 2017-01-04 22:11:07.000000000 +0000
@@ -18,4 +18,4 @@
t-expect-fail E:'archive contains .* with different checksum' \
test-push-2 --new
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/orig-include-exclude-chkquery dgit-2.14/tests/tests/orig-include-exclude-chkquery
--- dgit-2.13/tests/tests/orig-include-exclude-chkquery 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/orig-include-exclude-chkquery 2017-01-04 22:11:07.000000000 +0000
@@ -30,4 +30,4 @@
. $troot/lib-orig-include-exclude
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/overwrite-chkclog dgit-2.14/tests/tests/overwrite-chkclog
--- dgit-2.13/tests/tests/overwrite-chkclog 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-chkclog 2017-01-04 22:11:07.000000000 +0000
@@ -36,4 +36,4 @@
t-dgit push --overwrite stable
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/overwrite-junk dgit-2.14/tests/tests/overwrite-junk
--- dgit-2.13/tests/tests/overwrite-junk 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-junk 2017-01-04 22:11:07.000000000 +0000
@@ -19,4 +19,4 @@
t-dgit push --overwrite=1.2 stable
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/overwrite-splitbrains dgit-2.14/tests/tests/overwrite-splitbrains
--- dgit-2.13/tests/tests/overwrite-splitbrains 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-splitbrains 2017-01-04 22:11:07.000000000 +0000
@@ -24,4 +24,4 @@
t-gbp-pushed-good
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/overwrite-version dgit-2.14/tests/tests/overwrite-version
--- dgit-2.13/tests/tests/overwrite-version 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-version 2017-01-04 22:11:07.000000000 +0000
@@ -17,4 +17,4 @@
t-dgit push --overwrite=1.2 stable
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/push-buildproductsdir dgit-2.14/tests/tests/push-buildproductsdir
--- dgit-2.13/tests/tests/push-buildproductsdir 2016-12-14 21:31:15.000000000 +0000
+++ dgit-2.14/tests/tests/push-buildproductsdir 2017-01-04 22:11:07.000000000 +0000
@@ -28,4 +28,4 @@
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/push-newpackage dgit-2.14/tests/tests/push-newpackage
--- dgit-2.13/tests/tests/push-newpackage 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/push-newpackage 2017-01-04 22:11:07.000000000 +0000
@@ -27,4 +27,4 @@
t-pushed-good master
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/push-nextdgit dgit-2.14/tests/tests/push-nextdgit
--- dgit-2.13/tests/tests/push-nextdgit 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/push-nextdgit 2017-01-04 22:11:07.000000000 +0000
@@ -22,4 +22,4 @@
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/quilt dgit-2.14/tests/tests/quilt
--- dgit-2.13/tests/tests/quilt 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt 2017-01-04 22:11:07.000000000 +0000
@@ -93,4 +93,4 @@
mv ../this.cmp ../last.cmp
done
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/quilt-gbp dgit-2.14/tests/tests/quilt-gbp
--- dgit-2.13/tests/tests/quilt-gbp 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-gbp 2017-01-04 22:11:07.000000000 +0000
@@ -58,4 +58,4 @@
test-push-2
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/quilt-gbp-build-modes dgit-2.14/tests/tests/quilt-gbp-build-modes
--- dgit-2.13/tests/tests/quilt-gbp-build-modes 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-gbp-build-modes 2017-01-04 22:11:07.000000000 +0000
@@ -10,4 +10,4 @@
'gbp-build -S' \
'gbp-build -b' \
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/quilt-gbp-build-modes-sbuild dgit-2.14/tests/tests/quilt-gbp-build-modes-sbuild
--- dgit-2.13/tests/tests/quilt-gbp-build-modes-sbuild 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-gbp-build-modes-sbuild 2017-01-04 22:11:07.000000000 +0000
@@ -9,4 +9,4 @@
bm-gbp-example-acts \
'sbuild -c build --arch-all' \
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/quilt-singlepatch dgit-2.14/tests/tests/quilt-singlepatch
--- dgit-2.13/tests/tests/quilt-singlepatch 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-singlepatch 2017-01-04 22:11:07.000000000 +0000
@@ -36,4 +36,4 @@
series
END
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/quilt-splitbrains dgit-2.14/tests/tests/quilt-splitbrains
--- dgit-2.13/tests/tests/quilt-splitbrains 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-splitbrains 2017-01-04 22:11:07.000000000 +0000
@@ -137,4 +137,4 @@
want-success dpm --new
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/rpush dgit-2.14/tests/tests/rpush
--- dgit-2.13/tests/tests/rpush 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/rpush 2017-01-04 22:11:07.000000000 +0000
@@ -28,4 +28,4 @@
cd $tmp/$p
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/spelling dgit-2.14/tests/tests/spelling
--- dgit-2.13/tests/tests/spelling 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/spelling 2017-01-04 22:11:07.000000000 +0000
@@ -13,4 +13,4 @@
test $rc = 1
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/tag-updates dgit-2.14/tests/tests/tag-updates
--- dgit-2.13/tests/tests/tag-updates 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/tag-updates 2017-01-04 22:11:07.000000000 +0000
@@ -34,4 +34,4 @@
t-ref-same-exact $tagref
fetch-check
-echo done.
+t-ok
diff -Nru dgit-2.13/tests/tests/test-list-uptodate dgit-2.14/tests/tests/test-list-uptodate
--- dgit-2.13/tests/tests/test-list-uptodate 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/test-list-uptodate 2017-01-04 22:11:07.000000000 +0000
@@ -7,3 +7,5 @@
cd $root
$troot/enumerate-tests gencontrol >$tmp/control-expected
diff debian/tests/control $tmp/control-expected
+
+t-ok
diff -Nru dgit-2.13/tests/tests/trustingpolicy-replay dgit-2.14/tests/tests/trustingpolicy-replay
--- dgit-2.13/tests/tests/trustingpolicy-replay 2016-12-19 17:32:37.000000000 +0000
+++ dgit-2.14/tests/tests/trustingpolicy-replay 2017-01-04 22:11:07.000000000 +0000
@@ -82,4 +82,4 @@
attempt-replay "does not declare previously tags/$tagpfx/$v"
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/unrepresentable dgit-2.14/tests/tests/unrepresentable
--- dgit-2.13/tests/tests/unrepresentable 2016-12-20 21:36:58.000000000 +0000
+++ dgit-2.14/tests/tests/unrepresentable 2017-01-04 22:11:07.000000000 +0000
@@ -49,4 +49,4 @@
start
attempt
-echo ok.
+t-ok
diff -Nru dgit-2.13/tests/tests/version-opt dgit-2.14/tests/tests/version-opt
--- dgit-2.13/tests/tests/version-opt 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/version-opt 2017-01-04 22:11:07.000000000 +0000
@@ -29,4 +29,4 @@
fgrep 'Update to version 1.1' ../${p}_${v}_source.changes
-echo ok.
+t-ok
Binary files /tmp/eWrXGWK9In/dgit-2.13/tests/worktrees/example_1.0.tar and /tmp/KlXJ3qcyMj/dgit-2.14/tests/worktrees/example_1.0.tar differ
diff -Nru --exclude test dgit-2.13/debian/changelog dgit-2.14/debian/changelog
--- dgit-2.13/debian/changelog 2016-12-21 01:32:41.000000000 +0000
+++ dgit-2.14/debian/changelog 2017-01-04 22:52:55.000000000 +0000
@@ -1,3 +1,14 @@
+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:
diff -Nru --exclude test dgit-2.13/dgit dgit-2.14/dgit
--- dgit-2.13/dgit 2016-12-20 21:34:21.000000000 +0000
+++ dgit-2.14/dgit 2017-01-04 22:11:08.000000000 +0000
@@ -3538,7 +3538,7 @@
parent $dgitview
parent $archive_hash
author $authline
-commiter $authline
+committer $authline
$msg_msg
@@ -5944,10 +5944,14 @@
progress "Import, merging.";
my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
my $version = getfield $dsc, 'Version';
+ my $clogp = commit_getclogp $newhash;
+ my $authline = clogp_authline $clogp;
$newhash = make_commit_text <<END;
tree $tree
parent $newhash
parent $oldhash
+author $authline
+committer $authline
Merge $package ($version) import into $dstbranch
END
diff -Nru --exclude test dgit-2.13/tests/lib dgit-2.14/tests/lib
--- dgit-2.13/tests/lib 2016-12-19 17:32:27.000000000 +0000
+++ dgit-2.14/tests/lib 2017-01-04 22:11:07.000000000 +0000
@@ -349,6 +349,25 @@
esac
}
+t-git-fsck () {
+ git fsck --no-dangling --strict
+}
+
+t-fscks () {
+ (
+ shopt -s nullglob
+ for d in $tmp/*/.git $tmp/git/*.git; do
+ cd "$d"
+ t-git-fsck
+ done
+ )
+}
+
+t-ok () {
+ t-fscks
+ echo ok.
+}
+
t-rm-dput-dropping () {
rm -f $tmp/${p}_${v}_*.upload
}
diff -Nru --exclude test dgit-2.13/tests/setup/examplegit dgit-2.14/tests/setup/examplegit
--- dgit-2.13/tests/setup/examplegit 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/setup/examplegit 2017-01-04 22:11:07.000000000 +0000
@@ -50,4 +50,4 @@
t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p"
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/setup/gnupg dgit-2.14/tests/setup/gnupg
--- dgit-2.13/tests/setup/gnupg 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/setup/gnupg 2017-01-04 22:11:07.000000000 +0000
@@ -12,4 +12,4 @@
t-setup-done 'GNUPGHOME' 'gnupg'
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/absurd-gitapply dgit-2.14/tests/tests/absurd-gitapply
--- dgit-2.13/tests/tests/absurd-gitapply 2016-11-08 20:40:18.000000000 +0000
+++ dgit-2.14/tests/tests/absurd-gitapply 2017-01-04 22:11:07.000000000 +0000
@@ -13,4 +13,4 @@
cd $p
grep moo moo
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/build-modes dgit-2.14/tests/tests/build-modes
--- dgit-2.13/tests/tests/build-modes 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/build-modes 2017-01-04 22:11:07.000000000 +0000
@@ -32,4 +32,4 @@
bm-act-iterate
done
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/build-modes-gbp dgit-2.14/tests/tests/build-modes-gbp
--- dgit-2.13/tests/tests/build-modes-gbp 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/build-modes-gbp 2017-01-04 22:11:07.000000000 +0000
@@ -36,4 +36,4 @@
bm-act-iterate
done
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/build-modes-sbuild dgit-2.14/tests/tests/build-modes-sbuild
--- dgit-2.13/tests/tests/build-modes-sbuild 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/build-modes-sbuild 2017-01-04 22:11:07.000000000 +0000
@@ -15,4 +15,4 @@
bm-guess-e-source-e-targets "$act"
bm-act-iterate
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/clone-clogsigpipe dgit-2.14/tests/tests/clone-clogsigpipe
--- dgit-2.13/tests/tests/clone-clogsigpipe 2016-11-08 20:40:23.000000000 +0000
+++ dgit-2.14/tests/tests/clone-clogsigpipe 2017-01-04 22:11:07.000000000 +0000
@@ -7,4 +7,4 @@
t-dgit clone $p
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/clone-gitnosuite dgit-2.14/tests/tests/clone-gitnosuite
--- dgit-2.13/tests/tests/clone-gitnosuite 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/clone-gitnosuite 2017-01-04 22:11:07.000000000 +0000
@@ -7,3 +7,5 @@
cp -a $tmp/git/_template $dgitrepo
t-dgit clone $p
+
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/clone-nogit dgit-2.14/tests/tests/clone-nogit
--- dgit-2.13/tests/tests/clone-nogit 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/clone-nogit 2017-01-04 22:11:07.000000000 +0000
@@ -22,4 +22,4 @@
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/clone-reprepro dgit-2.14/tests/tests/clone-reprepro
--- dgit-2.13/tests/tests/clone-reprepro 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/clone-reprepro 2017-01-04 22:11:07.000000000 +0000
@@ -30,4 +30,4 @@
t-refs-same-start
t-refs-same refs/remotes/dgit/sid,stable refs/remotes/dgit/sid
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/debpolicy-dbretry dgit-2.14/tests/tests/debpolicy-dbretry
--- dgit-2.13/tests/tests/debpolicy-dbretry 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/debpolicy-dbretry 2017-01-04 22:11:07.000000000 +0000
@@ -64,4 +64,4 @@
t-policy-admin list-taints | tee $tmp/taints-list | grep $autotaint
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/debpolicy-newreject dgit-2.14/tests/tests/debpolicy-newreject
--- dgit-2.13/tests/tests/debpolicy-newreject 2016-12-19 15:53:12.000000000 +0000
+++ dgit-2.14/tests/tests/debpolicy-newreject 2017-01-04 22:11:07.000000000 +0000
@@ -118,4 +118,4 @@
'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
t-dgit push
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/distropatches-reject dgit-2.14/tests/tests/distropatches-reject
--- dgit-2.13/tests/tests/distropatches-reject 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/distropatches-reject 2017-01-04 22:11:07.000000000 +0000
@@ -78,4 +78,4 @@
expect-fail-distro-series DEB_VENDOR \
t-dgit clone $p
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/drs-push-masterupdate dgit-2.14/tests/tests/drs-push-masterupdate
--- dgit-2.13/tests/tests/drs-push-masterupdate 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/drs-push-masterupdate 2017-01-04 22:11:07.000000000 +0000
@@ -47,4 +47,4 @@
push_and_check +HEAD:master
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/drs-push-rejects dgit-2.14/tests/tests/drs-push-rejects
--- dgit-2.13/tests/tests/drs-push-rejects 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/drs-push-rejects 2017-01-04 22:11:07.000000000 +0000
@@ -191,4 +191,4 @@
prep_dm_mangle ''
mustsucceed $push_spec # succeeds
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/dsd-clone-drs dgit-2.14/tests/tests/dsd-clone-drs
--- dgit-2.13/tests/tests/dsd-clone-drs 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/dsd-clone-drs 2017-01-04 22:11:07.000000000 +0000
@@ -13,4 +13,4 @@
cd drs-cloned
ls -al infra/dgit-repos-server
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/fetch-localgitonly dgit-2.14/tests/tests/fetch-localgitonly
--- dgit-2.13/tests/tests/fetch-localgitonly 2016-11-08 20:43:13.000000000 +0000
+++ dgit-2.14/tests/tests/fetch-localgitonly 2017-01-04 22:11:07.000000000 +0000
@@ -17,4 +17,4 @@
t-cloned-fetched-good
t-has-ancestor $old
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/fetch-somegit-notlast dgit-2.14/tests/tests/fetch-somegit-notlast
--- dgit-2.13/tests/tests/fetch-somegit-notlast 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/fetch-somegit-notlast 2017-01-04 22:11:07.000000000 +0000
@@ -12,4 +12,4 @@
t-cloned-fetched-good
t-has-ancestor debian/3-1
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/gbp-orig dgit-2.14/tests/tests/gbp-orig
--- dgit-2.13/tests/tests/gbp-orig 2016-12-19 17:32:27.000000000 +0000
+++ dgit-2.14/tests/tests/gbp-orig 2017-01-04 22:11:07.000000000 +0000
@@ -74,4 +74,4 @@
cd $tmp
diff -ruN gbp-output/tar-x tar-x
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/gitconfig dgit-2.14/tests/tests/gitconfig
--- dgit-2.13/tests/tests/gitconfig 2016-11-08 20:46:51.000000000 +0000
+++ dgit-2.14/tests/tests/gitconfig 2017-01-04 22:11:07.000000000 +0000
@@ -35,4 +35,4 @@
t-dgit -cdgit.default.clean-mode=none clean
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/import-dsc dgit-2.14/tests/tests/import-dsc
--- dgit-2.13/tests/tests/import-dsc 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/import-dsc 2017-01-04 22:11:07.000000000 +0000
@@ -96,4 +96,4 @@
t-expect-fail 'signature check failed' \
t-dgit import-dsc --require-valid-signature $dsc2 +$branch
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/import-native dgit-2.14/tests/tests/import-native
--- dgit-2.13/tests/tests/import-native 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/import-native 2017-01-04 22:11:07.000000000 +0000
@@ -66,4 +66,4 @@
lastv_imp=$this_imp
done
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/import-nonnative dgit-2.14/tests/tests/import-nonnative
--- dgit-2.13/tests/tests/import-nonnative 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/import-nonnative 2017-01-04 22:11:07.000000000 +0000
@@ -14,4 +14,4 @@
# 3.0 (quilt), single-debian-patch, one orig
t-import-chk sunxi-tools 1.2-2.~~dgittest
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/import-tarbomb dgit-2.14/tests/tests/import-tarbomb
--- dgit-2.13/tests/tests/import-tarbomb 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/import-tarbomb 2017-01-04 22:11:07.000000000 +0000
@@ -46,4 +46,4 @@
tar zvcf ../$orig .
mangle2
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/inarchivecopy dgit-2.14/tests/tests/inarchivecopy
--- dgit-2.13/tests/tests/inarchivecopy 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/inarchivecopy 2017-01-04 22:11:07.000000000 +0000
@@ -76,4 +76,4 @@
copy-check 2.1 testing
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/mirror dgit-2.14/tests/tests/mirror
--- dgit-2.13/tests/tests/mirror 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/mirror 2017-01-04 22:11:07.000000000 +0000
@@ -77,4 +77,4 @@
t-check-mirrored
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/mirror-debnewgit dgit-2.14/tests/tests/mirror-debnewgit
--- dgit-2.13/tests/tests/mirror-debnewgit 2016-11-08 20:50:17.000000000 +0000
+++ dgit-2.14/tests/tests/mirror-debnewgit 2017-01-04 22:11:07.000000000 +0000
@@ -22,3 +22,5 @@
t-dgit build
t-dgit push
t-check-mirrored
+
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/mirror-private dgit-2.14/tests/tests/mirror-private
--- dgit-2.13/tests/tests/mirror-private 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/mirror-private 2017-01-04 22:11:07.000000000 +0000
@@ -23,4 +23,4 @@
t-check-not-mirrored
t-files-notexist $reposmirror/$p.*
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/mismatches-contents dgit-2.14/tests/tests/mismatches-contents
--- dgit-2.13/tests/tests/mismatches-contents 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/mismatches-contents 2017-01-04 22:11:07.000000000 +0000
@@ -21,4 +21,4 @@
t-expect-fail 'debian/TRASH' \
t-dgit push --new
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/mismatches-dscchanges dgit-2.14/tests/tests/mismatches-dscchanges
--- dgit-2.13/tests/tests/mismatches-dscchanges 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/mismatches-dscchanges 2017-01-04 22:11:07.000000000 +0000
@@ -31,4 +31,4 @@
t-dgit -wgf push --new
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/multisuite dgit-2.14/tests/tests/multisuite
--- dgit-2.13/tests/tests/multisuite 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/multisuite 2017-01-04 22:11:07.000000000 +0000
@@ -54,4 +54,4 @@
t-has-parent-or-is HEAD $rcombined
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/oldnewtagalt dgit-2.14/tests/tests/oldnewtagalt
--- dgit-2.13/tests/tests/oldnewtagalt 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/oldnewtagalt 2017-01-04 22:11:07.000000000 +0000
@@ -21,5 +21,5 @@
test-push "newtag $count"
done
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/orig-include-exclude dgit-2.14/tests/tests/orig-include-exclude
--- dgit-2.13/tests/tests/orig-include-exclude 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/orig-include-exclude 2017-01-04 22:11:07.000000000 +0000
@@ -18,4 +18,4 @@
t-expect-fail E:'archive contains .* with different checksum' \
test-push-2 --new
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/orig-include-exclude-chkquery dgit-2.14/tests/tests/orig-include-exclude-chkquery
--- dgit-2.13/tests/tests/orig-include-exclude-chkquery 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/orig-include-exclude-chkquery 2017-01-04 22:11:07.000000000 +0000
@@ -30,4 +30,4 @@
. $troot/lib-orig-include-exclude
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/overwrite-chkclog dgit-2.14/tests/tests/overwrite-chkclog
--- dgit-2.13/tests/tests/overwrite-chkclog 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-chkclog 2017-01-04 22:11:07.000000000 +0000
@@ -36,4 +36,4 @@
t-dgit push --overwrite stable
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/overwrite-junk dgit-2.14/tests/tests/overwrite-junk
--- dgit-2.13/tests/tests/overwrite-junk 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-junk 2017-01-04 22:11:07.000000000 +0000
@@ -19,4 +19,4 @@
t-dgit push --overwrite=1.2 stable
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/overwrite-splitbrains dgit-2.14/tests/tests/overwrite-splitbrains
--- dgit-2.13/tests/tests/overwrite-splitbrains 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-splitbrains 2017-01-04 22:11:07.000000000 +0000
@@ -24,4 +24,4 @@
t-gbp-pushed-good
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/overwrite-version dgit-2.14/tests/tests/overwrite-version
--- dgit-2.13/tests/tests/overwrite-version 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/overwrite-version 2017-01-04 22:11:07.000000000 +0000
@@ -17,4 +17,4 @@
t-dgit push --overwrite=1.2 stable
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/push-buildproductsdir dgit-2.14/tests/tests/push-buildproductsdir
--- dgit-2.13/tests/tests/push-buildproductsdir 2016-12-14 21:31:15.000000000 +0000
+++ dgit-2.14/tests/tests/push-buildproductsdir 2017-01-04 22:11:07.000000000 +0000
@@ -28,4 +28,4 @@
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/push-newpackage dgit-2.14/tests/tests/push-newpackage
--- dgit-2.13/tests/tests/push-newpackage 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/push-newpackage 2017-01-04 22:11:07.000000000 +0000
@@ -27,4 +27,4 @@
t-pushed-good master
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/push-nextdgit dgit-2.14/tests/tests/push-nextdgit
--- dgit-2.13/tests/tests/push-nextdgit 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/push-nextdgit 2017-01-04 22:11:07.000000000 +0000
@@ -22,4 +22,4 @@
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/quilt dgit-2.14/tests/tests/quilt
--- dgit-2.13/tests/tests/quilt 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt 2017-01-04 22:11:07.000000000 +0000
@@ -93,4 +93,4 @@
mv ../this.cmp ../last.cmp
done
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/quilt-gbp dgit-2.14/tests/tests/quilt-gbp
--- dgit-2.13/tests/tests/quilt-gbp 2016-11-08 20:47:20.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-gbp 2017-01-04 22:11:07.000000000 +0000
@@ -58,4 +58,4 @@
test-push-2
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/quilt-gbp-build-modes dgit-2.14/tests/tests/quilt-gbp-build-modes
--- dgit-2.13/tests/tests/quilt-gbp-build-modes 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-gbp-build-modes 2017-01-04 22:11:07.000000000 +0000
@@ -10,4 +10,4 @@
'gbp-build -S' \
'gbp-build -b' \
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/quilt-gbp-build-modes-sbuild dgit-2.14/tests/tests/quilt-gbp-build-modes-sbuild
--- dgit-2.13/tests/tests/quilt-gbp-build-modes-sbuild 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-gbp-build-modes-sbuild 2017-01-04 22:11:07.000000000 +0000
@@ -9,4 +9,4 @@
bm-gbp-example-acts \
'sbuild -c build --arch-all' \
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/quilt-singlepatch dgit-2.14/tests/tests/quilt-singlepatch
--- dgit-2.13/tests/tests/quilt-singlepatch 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-singlepatch 2017-01-04 22:11:07.000000000 +0000
@@ -36,4 +36,4 @@
series
END
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/quilt-splitbrains dgit-2.14/tests/tests/quilt-splitbrains
--- dgit-2.13/tests/tests/quilt-splitbrains 2016-10-31 01:21:59.000000000 +0000
+++ dgit-2.14/tests/tests/quilt-splitbrains 2017-01-04 22:11:07.000000000 +0000
@@ -137,4 +137,4 @@
want-success dpm --new
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/rpush dgit-2.14/tests/tests/rpush
--- dgit-2.13/tests/tests/rpush 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/rpush 2017-01-04 22:11:07.000000000 +0000
@@ -28,4 +28,4 @@
cd $tmp/$p
t-pushed-good dgit/sid
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/spelling dgit-2.14/tests/tests/spelling
--- dgit-2.13/tests/tests/spelling 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/spelling 2017-01-04 22:11:07.000000000 +0000
@@ -13,4 +13,4 @@
test $rc = 1
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/tag-updates dgit-2.14/tests/tests/tag-updates
--- dgit-2.13/tests/tests/tag-updates 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/tag-updates 2017-01-04 22:11:07.000000000 +0000
@@ -34,4 +34,4 @@
t-ref-same-exact $tagref
fetch-check
-echo done.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/test-list-uptodate dgit-2.14/tests/tests/test-list-uptodate
--- dgit-2.13/tests/tests/test-list-uptodate 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/test-list-uptodate 2017-01-04 22:11:07.000000000 +0000
@@ -7,3 +7,5 @@
cd $root
$troot/enumerate-tests gencontrol >$tmp/control-expected
diff debian/tests/control $tmp/control-expected
+
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/trustingpolicy-replay dgit-2.14/tests/tests/trustingpolicy-replay
--- dgit-2.13/tests/tests/trustingpolicy-replay 2016-12-19 17:32:37.000000000 +0000
+++ dgit-2.14/tests/tests/trustingpolicy-replay 2017-01-04 22:11:07.000000000 +0000
@@ -82,4 +82,4 @@
attempt-replay "does not declare previously tags/$tagpfx/$v"
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/unrepresentable dgit-2.14/tests/tests/unrepresentable
--- dgit-2.13/tests/tests/unrepresentable 2016-12-20 21:36:58.000000000 +0000
+++ dgit-2.14/tests/tests/unrepresentable 2017-01-04 22:11:07.000000000 +0000
@@ -49,4 +49,4 @@
start
attempt
-echo ok.
+t-ok
diff -Nru --exclude test dgit-2.13/tests/tests/version-opt dgit-2.14/tests/tests/version-opt
--- dgit-2.13/tests/tests/version-opt 2016-10-30 21:20:28.000000000 +0000
+++ dgit-2.14/tests/tests/version-opt 2017-01-04 22:11:07.000000000 +0000
@@ -29,4 +29,4 @@
fgrep 'Update to version 1.1' ../${p}_${v}_source.changes
-echo ok.
+t-ok
Binary files /tmp/X1iJdrwf9m/dgit-2.13/tests/worktrees/example_1.0.tar and /tmp/HXgRBHEm8U/dgit-2.14/tests/worktrees/example_1.0.tar differ
Reply to: