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>
- 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:
esac
}
- git fsck --no-dangling --strict
+ 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
}
mustfail 'tag name in tag is wrong' \
refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1
+echo ====
+badcommit=$(
+ git cat-file commit HEAD | \
+ perl -pe 's/^committer.*\n//' | \
+ git hash-object -w -t commit --stdin
+)
+git checkout -b broken $badcommit
+prep unstable sid
+mktag
+mustfail "corrupted object $badcommit" $push_spec
+
+git checkout dgit/sid
prep unstable sid
mktag
mustsucceed $push_spec # succeeds
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