summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-09 01:13:12 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-10 01:01:10 +0100
commita6ba75765d8161841a511cc5eddb79d0209cf0d9 (patch)
tree690311ea62da494fc9f3276021bd38fc48360b1e /tests
parent9690891716a743f736f3a745363290cfb64910a9 (diff)
Test suite: quilt: Provide Gbp-pq headers in our new patch test case
And expect dgit to honour them Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/quilt2
-rw-r--r--tests/worktrees/ruby-rails-3.2_test.tarbin215040 -> 215040 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/quilt b/tests/tests/quilt
index 37cb8d1..a6f78cd 100755
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -40,7 +40,7 @@ git merge branch
iteration
diff <<END - debian/patches/series
-change-something-in-the-upstream-yml
+ups-topic/ups-yml
spongiform-upstream-new-file-incl-change
zorkmid-options-=-42
END
diff --git a/tests/worktrees/ruby-rails-3.2_test.tar b/tests/worktrees/ruby-rails-3.2_test.tar
index fe01878..85365fe 100644
--- a/tests/worktrees/ruby-rails-3.2_test.tar
+++ b/tests/worktrees/ruby-rails-3.2_test.tar
Binary files differ