From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 5 Jan 2017 14:01:38 +0000 (+0000)
Subject: Merge tag dgit/2.14 into `defence in dgit-repos-server' branch
X-Git-Tag: debian/2.15~4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6b959bf443c37b26f058aed813885c469c660828;hp=7a47622fe7b1a2d1db2f3cb917926e93c683dc2a

Merge tag dgit/2.14 into `defence in dgit-repos-server' branch

Fix up semantic conflict: the new git-fsck test (in 2.14) fails on the
new broken commits (in the `defence in dgit-repos-server' branch).

We need to disable this.  Ideally we would make a tighter test, but
that's too much to do in a merge.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 6d0b6137..bfbffd5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
-dgit (2.14) unstable; urgency=low
+dgit (2.15~) unstable; urgency=low
 
   * 
 
  --
 
+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 --git a/dgit b/dgit
index 1e7c923e..9d3584fb 100755
--- a/dgit
+++ b/dgit
@@ -3538,7 +3538,7 @@ tree $tree
 parent $dgitview
 parent $archive_hash
 author $authline
-commiter $authline
+committer $authline
 
 $msg_msg
 
@@ -5944,10 +5944,14 @@ END
 	    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 --git a/tests/lib b/tests/lib
index d075bc76..5fcb6f65 100644
--- a/tests/lib
+++ b/tests/lib
@@ -349,6 +349,25 @@ t-git-dir-check () {
 	esac
 }
 
+t-git-fsck () {
+	git fsck --no-dangling --strict || ${expect_fsck_fail-false}
+}
+
+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 --git a/tests/setup/examplegit b/tests/setup/examplegit
index 98900d09..112e27a6 100755
--- a/tests/setup/examplegit
+++ b/tests/setup/examplegit
@@ -50,4 +50,4 @@ push-to master sid
 
 t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p"
 
-echo ok.
+t-ok
diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index 97cdb649..d23ecfa3 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -12,4 +12,4 @@ gpg --list-secret
 
 t-setup-done 'GNUPGHOME' 'gnupg'
 
-echo ok.
+t-ok
diff --git a/tests/tests/absurd-gitapply b/tests/tests/absurd-gitapply
index c7eea86c..90c44be2 100755
--- a/tests/tests/absurd-gitapply
+++ b/tests/tests/absurd-gitapply
@@ -13,4 +13,4 @@ t-dgit clone $p
 cd $p
 grep moo moo
 
-echo ok.
+t-ok
diff --git a/tests/tests/build-modes b/tests/tests/build-modes
index 18ead358..c476ec81 100755
--- a/tests/tests/build-modes
+++ b/tests/tests/build-modes
@@ -32,4 +32,4 @@ for act in					\
 	bm-act-iterate
 done
 
-echo ok.
+t-ok
diff --git a/tests/tests/build-modes-gbp b/tests/tests/build-modes-gbp
index e8d9c160..50a6288e 100755
--- a/tests/tests/build-modes-gbp
+++ b/tests/tests/build-modes-gbp
@@ -36,4 +36,4 @@ for act in					\
 	bm-act-iterate
 done
 
-echo ok.
+t-ok
diff --git a/tests/tests/build-modes-sbuild b/tests/tests/build-modes-sbuild
index f030f71a..19dcc8a4 100755
--- a/tests/tests/build-modes-sbuild
+++ b/tests/tests/build-modes-sbuild
@@ -15,4 +15,4 @@ real_act="$act"
 bm-guess-e-source-e-targets "$act"
 bm-act-iterate
 
-echo ok.
+t-ok
diff --git a/tests/tests/clone-clogsigpipe b/tests/tests/clone-clogsigpipe
index ff5f303e..4465cf38 100755
--- a/tests/tests/clone-clogsigpipe
+++ b/tests/tests/clone-clogsigpipe
@@ -7,4 +7,4 @@ t-git-none
 
 t-dgit clone $p
 
-echo ok.
+t-ok
diff --git a/tests/tests/clone-gitnosuite b/tests/tests/clone-gitnosuite
index 6b1c9375..83c996dc 100755
--- a/tests/tests/clone-gitnosuite
+++ b/tests/tests/clone-gitnosuite
@@ -7,3 +7,5 @@ t-git-none
 cp -a $tmp/git/_template $dgitrepo
 
 t-dgit clone $p
+
+t-ok
diff --git a/tests/tests/clone-nogit b/tests/tests/clone-nogit
index 477eb555..e99dac31 100755
--- a/tests/tests/clone-nogit
+++ b/tests/tests/clone-nogit
@@ -22,4 +22,4 @@ t-dgit push
 
 t-pushed-good dgit/sid
 
-echo ok.
+t-ok
diff --git a/tests/tests/clone-reprepro b/tests/tests/clone-reprepro
index 62b4c8d0..063a1387 100755
--- a/tests/tests/clone-reprepro
+++ b/tests/tests/clone-reprepro
@@ -30,4 +30,4 @@ t-dgit fetch unstable,stable
 t-refs-same-start
 t-refs-same refs/remotes/dgit/sid,stable refs/remotes/dgit/sid
 
-echo ok.
+t-ok
diff --git a/tests/tests/debpolicy-dbretry b/tests/tests/debpolicy-dbretry
index b2d80931..a9f23341 100755
--- a/tests/tests/debpolicy-dbretry
+++ b/tests/tests/debpolicy-dbretry
@@ -64,4 +64,4 @@ ls $tmp/sqlite3.rolled-back
 
 t-policy-admin list-taints | tee $tmp/taints-list | grep $autotaint
 
-echo ok.
+t-ok
diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 4da568c3..1fa67517 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -118,4 +118,4 @@ t-expect-push-fail \
     'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
 t-dgit push
 
-echo ok.
+t-ok
diff --git a/tests/tests/distropatches-reject b/tests/tests/distropatches-reject
index 31a3797e..75f43dba 100755
--- a/tests/tests/distropatches-reject
+++ b/tests/tests/distropatches-reject
@@ -78,4 +78,4 @@ DEB_VENDOR=test-dummy-aside \
 expect-fail-distro-series DEB_VENDOR \
 t-dgit clone $p
 
-echo done.
+t-ok
diff --git a/tests/tests/drs-push-masterupdate b/tests/tests/drs-push-masterupdate
index 9d2e6320..c8a5c5a4 100755
--- a/tests/tests/drs-push-masterupdate
+++ b/tests/tests/drs-push-masterupdate
@@ -47,4 +47,4 @@ git commit --allow-empty -m 'Has no common ancestor'
 
 push_and_check +HEAD:master
 
-echo done.
+t-ok
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 7b7c5f32..dee14b86 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -203,4 +203,7 @@ mustfail "not in permissions list although in keyring" $push_spec
 prep_dm_mangle ''
 mustsucceed $push_spec # succeeds
 
-echo ok.
+# we generate some junk, so we must tolerate git-fsck complaining
+expect_fsck_fail=true
+
+t-ok
diff --git a/tests/tests/dsd-clone-drs b/tests/tests/dsd-clone-drs
index 16bfa2ea..4346579a 100755
--- a/tests/tests/dsd-clone-drs
+++ b/tests/tests/dsd-clone-drs
@@ -13,4 +13,4 @@ t-dgit clone-dgit-repos-server drs-cloned
 cd drs-cloned
 ls -al infra/dgit-repos-server
 
-echo ok.
+t-ok
diff --git a/tests/tests/fetch-localgitonly b/tests/tests/fetch-localgitonly
index b0ade5f2..7d603b27 100755
--- a/tests/tests/fetch-localgitonly
+++ b/tests/tests/fetch-localgitonly
@@ -17,4 +17,4 @@ t-dgit pull
 t-cloned-fetched-good
 t-has-ancestor $old
 
-echo ok.
+t-ok
diff --git a/tests/tests/fetch-somegit-notlast b/tests/tests/fetch-somegit-notlast
index 15b94046..63abe8ad 100755
--- a/tests/tests/fetch-somegit-notlast
+++ b/tests/tests/fetch-somegit-notlast
@@ -12,4 +12,4 @@ cd $p
 t-cloned-fetched-good
 t-has-ancestor debian/3-1
 
-echo ok.
+t-ok
diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig
index 29dd4570..beea1216 100755
--- a/tests/tests/gbp-orig
+++ b/tests/tests/gbp-orig
@@ -74,4 +74,4 @@ done
 cd $tmp
 diff -ruN gbp-output/tar-x tar-x
 
-echo done.
+t-ok
diff --git a/tests/tests/gitconfig b/tests/tests/gitconfig
index 263d7332..12b342b5 100755
--- a/tests/tests/gitconfig
+++ b/tests/tests/gitconfig
@@ -35,4 +35,4 @@ t-dgit clean
 
 t-dgit -cdgit.default.clean-mode=none clean
 
-echo ok.
+t-ok
diff --git a/tests/tests/import-dsc b/tests/tests/import-dsc
index 98092a24..b86eef63 100755
--- a/tests/tests/import-dsc
+++ b/tests/tests/import-dsc
@@ -96,4 +96,4 @@ test "x$mb" = x
 t-expect-fail 'signature check failed' \
 t-dgit import-dsc --require-valid-signature $dsc2 +$branch
 
-echo ok.
+t-ok
diff --git a/tests/tests/import-native b/tests/tests/import-native
index d07cd9d4..1e093437 100755
--- a/tests/tests/import-native
+++ b/tests/tests/import-native
@@ -66,4 +66,4 @@ for v in $versions; do
 	lastv_imp=$this_imp
 done
 
-echo ok.
+t-ok
diff --git a/tests/tests/import-nonnative b/tests/tests/import-nonnative
index d324172e..35685630 100755
--- a/tests/tests/import-nonnative
+++ b/tests/tests/import-nonnative
@@ -14,4 +14,4 @@ t-import-chk example 1.0-1
 # 3.0 (quilt), single-debian-patch, one orig
 t-import-chk sunxi-tools 1.2-2.~~dgittest
 
-echo done.
+t-ok
diff --git a/tests/tests/import-tarbomb b/tests/tests/import-tarbomb
index c0bc4c46..9b7f65a6 100755
--- a/tests/tests/import-tarbomb
+++ b/tests/tests/import-tarbomb
@@ -46,4 +46,4 @@ echo SPONG >.pc/SPONG
 tar zvcf ../$orig .
 mangle2
 
-echo done.
+t-ok
diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index b34ba333..b1e0c5f2 100755
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -76,4 +76,4 @@ cd ..
 
 copy-check 2.1 testing
 
-echo ok.
+t-ok
diff --git a/tests/tests/mirror b/tests/tests/mirror
index 95c1cdbd..49476880 100755
--- a/tests/tests/mirror
+++ b/tests/tests/mirror
@@ -77,4 +77,4 @@ done
 
 t-check-mirrored
 
-echo done.
+t-ok
diff --git a/tests/tests/mirror-debnewgit b/tests/tests/mirror-debnewgit
index 4f247160..59b96ef7 100755
--- a/tests/tests/mirror-debnewgit
+++ b/tests/tests/mirror-debnewgit
@@ -22,3 +22,5 @@ t-commit 'test commit' 3-2
 t-dgit build
 t-dgit push
 t-check-mirrored
+
+t-ok
diff --git a/tests/tests/mirror-private b/tests/tests/mirror-private
index 40338356..c26ba892 100755
--- a/tests/tests/mirror-private
+++ b/tests/tests/mirror-private
@@ -23,4 +23,4 @@ t-dgit push --new
 t-check-not-mirrored
 t-files-notexist $reposmirror/$p.*
 
-echo ok.
+t-ok
diff --git a/tests/tests/mismatches-contents b/tests/tests/mismatches-contents
index b7c53f23..ea0d7243 100755
--- a/tests/tests/mismatches-contents
+++ b/tests/tests/mismatches-contents
@@ -21,4 +21,4 @@ t-dgit build-source
 t-expect-fail 'debian/TRASH' \
 t-dgit push --new
 
-echo ok.
+t-ok
diff --git a/tests/tests/mismatches-dscchanges b/tests/tests/mismatches-dscchanges
index 9bb554eb..85c70866 100755
--- a/tests/tests/mismatches-dscchanges
+++ b/tests/tests/mismatches-dscchanges
@@ -31,4 +31,4 @@ t-dgit -wgf build-source
 
 t-dgit -wgf push --new
 
-echo ok.
+t-ok
diff --git a/tests/tests/multisuite b/tests/tests/multisuite
index 0a580be9..d39475be 100755
--- a/tests/tests/multisuite
+++ b/tests/tests/multisuite
@@ -54,4 +54,4 @@ multi-good
 
 t-has-parent-or-is HEAD $rcombined
 
-echo ok.
+t-ok
diff --git a/tests/tests/oldnewtagalt b/tests/tests/oldnewtagalt
index cb270b26..098fe191 100755
--- a/tests/tests/oldnewtagalt
+++ b/tests/tests/oldnewtagalt
@@ -21,5 +21,5 @@ for count in 1 2; do
 	test-push "newtag $count"
 done
 
-echo ok.
+t-ok
 
diff --git a/tests/tests/orig-include-exclude b/tests/tests/orig-include-exclude
index 5617a1e7..a37f9974 100755
--- a/tests/tests/orig-include-exclude
+++ b/tests/tests/orig-include-exclude
@@ -18,4 +18,4 @@ test-push-1 1.1-1.3 '' stable
 t-expect-fail E:'archive contains .* with different checksum' \
 test-push-2 --new
 
-echo done.
+t-ok
diff --git a/tests/tests/orig-include-exclude-chkquery b/tests/tests/orig-include-exclude-chkquery
index 59fc80f0..f8eac579 100755
--- a/tests/tests/orig-include-exclude-chkquery
+++ b/tests/tests/orig-include-exclude-chkquery
@@ -30,4 +30,4 @@ test_push_2_hook=update-files_in_archive
 
 . $troot/lib-orig-include-exclude
 
-echo done.
+t-ok
diff --git a/tests/tests/overwrite-chkclog b/tests/tests/overwrite-chkclog
index 25356a87..3544390a 100755
--- a/tests/tests/overwrite-chkclog
+++ b/tests/tests/overwrite-chkclog
@@ -36,4 +36,4 @@ git revert --no-edit 'HEAD^{/Break changelog}'
 
 t-dgit push --overwrite stable
 
-echo done.
+t-ok
diff --git a/tests/tests/overwrite-junk b/tests/tests/overwrite-junk
index 2f8fd70e..e11d1f82 100755
--- a/tests/tests/overwrite-junk
+++ b/tests/tests/overwrite-junk
@@ -19,4 +19,4 @@ t-dgit -wgf build
 
 t-dgit push --overwrite=1.2 stable
 
-echo ok.
+t-ok
diff --git a/tests/tests/overwrite-splitbrains b/tests/tests/overwrite-splitbrains
index 725357d0..0ef03f65 100755
--- a/tests/tests/overwrite-splitbrains
+++ b/tests/tests/overwrite-splitbrains
@@ -24,4 +24,4 @@ t-dgit --quilt=gbp --dgit-view-save=split.p --overwrite push
 
 t-gbp-pushed-good
 
-echo ok.
+t-ok
diff --git a/tests/tests/overwrite-version b/tests/tests/overwrite-version
index 34ee0147..34301acd 100755
--- a/tests/tests/overwrite-version
+++ b/tests/tests/overwrite-version
@@ -17,4 +17,4 @@ t-dgit push stable
 
 t-dgit push --overwrite=1.2 stable
 
-echo ok.
+t-ok
diff --git a/tests/tests/push-buildproductsdir b/tests/tests/push-buildproductsdir
index 987c0818..505d1054 100755
--- a/tests/tests/push-buildproductsdir
+++ b/tests/tests/push-buildproductsdir
@@ -28,4 +28,4 @@ t-dgit --build-products-dir=../bpd push
 
 t-pushed-good dgit/sid
 
-echo ok.
+t-ok
diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index d0f3f35a..79355e3e 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -27,4 +27,4 @@ t-dgit push --new
 
 t-pushed-good master
 
-echo ok.
+t-ok
diff --git a/tests/tests/push-nextdgit b/tests/tests/push-nextdgit
index 8d4a36f7..d0436ab3 100755
--- a/tests/tests/push-nextdgit
+++ b/tests/tests/push-nextdgit
@@ -22,4 +22,4 @@ t-dgit push
 
 t-pushed-good dgit/sid
 
-echo ok.
+t-ok
diff --git a/tests/tests/quilt b/tests/tests/quilt
index 0462f1a8..1a921b37 100755
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -93,4 +93,4 @@ do
 	mv ../this.cmp ../last.cmp
 done
 
-echo ok.
+t-ok
diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 38d2489b..3ef89e8c 100755
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -58,4 +58,4 @@ t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
 
 test-push-2
 
-echo ok.
+t-ok
diff --git a/tests/tests/quilt-gbp-build-modes b/tests/tests/quilt-gbp-build-modes
index b89c26e2..cd77dab6 100755
--- a/tests/tests/quilt-gbp-build-modes
+++ b/tests/tests/quilt-gbp-build-modes
@@ -10,4 +10,4 @@ bm-gbp-example-acts				\
 	'gbp-build -S'				\
 	'gbp-build -b'				\
 
-echo ok.
+t-ok
diff --git a/tests/tests/quilt-gbp-build-modes-sbuild b/tests/tests/quilt-gbp-build-modes-sbuild
index 8da93d35..4c86bfe5 100755
--- a/tests/tests/quilt-gbp-build-modes-sbuild
+++ b/tests/tests/quilt-gbp-build-modes-sbuild
@@ -9,4 +9,4 @@ t-restrict x-dgit-schroot-build
 bm-gbp-example-acts				\
 	'sbuild -c build --arch-all'		\
 
-echo ok.
+t-ok
diff --git a/tests/tests/quilt-singlepatch b/tests/tests/quilt-singlepatch
index 6a043292..3b6e228d 100755
--- a/tests/tests/quilt-singlepatch
+++ b/tests/tests/quilt-singlepatch
@@ -36,4 +36,4 @@ debian-changes
 series
 END
 
-echo ok.
+t-ok
diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 112bc39e..9f0ae5ff 100755
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -137,4 +137,4 @@ t-commit dpmish-stable 1.0-6 $suite
 
 want-success dpm --new
 
-echo ok.
+t-ok
diff --git a/tests/tests/rpush b/tests/tests/rpush
index c627788f..71bbe2b3 100755
--- a/tests/tests/rpush
+++ b/tests/tests/rpush
@@ -28,4 +28,4 @@ t-dgit --ssh=$troot/ssh rpush somehost:$tmp/$p
 cd $tmp/$p
 t-pushed-good dgit/sid
 
-echo ok.
+t-ok
diff --git a/tests/tests/spelling b/tests/tests/spelling
index 74541b7d..ed1290c0 100755
--- a/tests/tests/spelling
+++ b/tests/tests/spelling
@@ -13,4 +13,4 @@ set -e
 
 test $rc = 1
 
-echo ok.
+t-ok
diff --git a/tests/tests/tag-updates b/tests/tests/tag-updates
index 8c6ab092..824fd1eb 100755
--- a/tests/tests/tag-updates
+++ b/tests/tests/tag-updates
@@ -34,4 +34,4 @@ t-refs-same-start
 t-ref-same-exact $tagref
 fetch-check
 
-echo done.
+t-ok
diff --git a/tests/tests/test-list-uptodate b/tests/tests/test-list-uptodate
index 65812ff9..1e5f1992 100755
--- a/tests/tests/test-list-uptodate
+++ b/tests/tests/test-list-uptodate
@@ -7,3 +7,5 @@ set -e
 cd $root
 $troot/enumerate-tests gencontrol >$tmp/control-expected
 diff debian/tests/control $tmp/control-expected
+
+t-ok
diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 2039ec6c..ad731f5b 100755
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -82,4 +82,4 @@ t-dgit push
 attempt-replay "does not declare previously tags/$tagpfx/$v"
 
 
-echo ok.
+t-ok
diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable
index 5b3e1393..0d02c6aa 100755
--- a/tests/tests/unrepresentable
+++ b/tests/tests/unrepresentable
@@ -49,4 +49,4 @@ badly-2
 start
 attempt
 
-echo ok.
+t-ok
diff --git a/tests/tests/version-opt b/tests/tests/version-opt
index 93c6a452..22c35e7e 100755
--- a/tests/tests/version-opt
+++ b/tests/tests/version-opt
@@ -29,4 +29,4 @@ done
 
 fgrep 'Update to version 1.1' ../${p}_${v}_source.changes
 
-echo ok.
+t-ok
diff --git a/tests/worktrees/example_1.0.tar b/tests/worktrees/example_1.0.tar
index a38dfb07..50baa337 100644
Binary files a/tests/worktrees/example_1.0.tar and b/tests/worktrees/example_1.0.tar differ