| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
| |
Test that the previously-rewound-from tainted object is found early,
and can be overridden permanently.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This will ensure that the direct command fallback is tested, I think.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace several t-expect-push-fail with t-expect-push-fail-tainted.
Abolish the adhoc use of --force-push-tainted.
Adjust the expected errors accordingly.
Fix the expected errors to use anchored patterns (see the comment for
t-expect-push-fail-tainted).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
This is not anything to do with push. (Not sure why this isn't a call
to t-git-objects-not-present.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Make it take one string, and expect the same message both locally and
when printed by the remote.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
The messages now come out the same.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
And rename it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Check that saying --deliberately-not-fast-forward when it's not
actually reound, doesn't help.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
And test that they still fail if forced.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Our new checks on tainted objects will use this.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
The early detection is going to change quite a few some error
messages, since they'll be generated from different information in a
different way.
For now, pass the force option that forces the previous behaviour,
where the server rejects it. That retains the error message.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Testing only the new spelling is fine I think.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Apparently we don't have one of these!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
This doesn't appear in the default rune, but we want it for our
testing. Hopefully adding it won't cause bad divergence between test
case and reality.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
| |
Closes: #1026918
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
| |
We're going to want to call this several times.
Use the config override here. This is going to become the test case
for all that.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This doesn't seem relevant any more, if it ever was.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Check that we get the expected warnings, and that dpkg-source hates a
named pipe.
(In practice if I nobble the code in dgit which checks all this, we
get a different quilt fixup error, but not after dgit caused tar to
read files it shouldn't and make unreferenced git objects out of them,
which is still bad.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We must also adjust the gdr-fresh test case: now its patches are made
by dgit, not gdr. We now check that they are correct (that is, that
dgit is now happy with things) but not what they look like).
Several other test cases test the dgit gdr makepatches functionality,
calling t-gdr-made-patches (via t-gdr-good, for example). (I have
verified that changing the remaining "return 1" from branch_is_gdr to
"return 0" does cause many test failures.)
Closes: #1015779
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Have tested that this fails before the previous fix.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Otherwise the check we're about to add spots the problem before the
error we are checking for occurs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change the global test git config to reject plain "git push".
Update almost all tests to use "push-built".
In some cases, change to using "push-source".
In one case (chosen essentially arbitrarily), use the config override
and continue using push to mean push-built.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
| |
This represents a poor outcome which happily no longer occurs unless
the user is using the deprecated-by-us "single-debian-patch" features.
For more discussion see comments in quilt_fixup_dpkgsource_singlepatch.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This represents a poor outcome which happily no longer occurs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
This is to replace single-debian-patch.
Closes: #1018984
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Now, with single-debian-patch, we can still handle file removals.
(This may fix other corner cases too.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
git diff can represent changes to symlinks, but dpkg-source uses
diff(1) to apply changes, and git diff cannot. The result if we
permit them is that we end up making source packages that can't be
built, or aren't treesame to our HEAD.
Reject this early. This resolves the error handling regression in
dgit: quilt fixup: Don't use dpkg-source --commit, but git diff
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now we use git diffs, which can represent changes to the executability
of files. dpkg-source uses diff(1) to apply these. So it all works.
Handle this by normalising the +x bits before seeing if the mode
changed.
Now we properly support executable files.
Closes: #995056
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are many things that dpkg-source can successfully extract, but
which it can't create. (This is because dpkg-source largely delegates
application to diff(1), and diff can do many more things nowadays.)
Most real packages were made with git-format-patch or equivalent
nowadays, so use of these features is common. (Hence #949675
and #995056, where even glibc has patches that dpkg-source cannot make.)
Right now the practical consequences are:
* Creating an executable file is fixed. This actually completes
the work for #949675.
* Creating a symlink has a regression in the error handling.
Previously, dpkg-source --commit failed during quilt fixup.
Now, we happily git diff which generates a patch that dpkg-source
can't apply. We're going to fix this soon by aligning the
representable change checking with reality.
* It's faster and less complicated.
Closes: #1018143
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A test case like this was removed in a0ac573f8359
dgit: tolerate making quilt patches creating +x files
That removal was a mistake. We should have changed the test outcome.
In fact, right now the test outcome is that we can't in fact make new
patches like this, because dpkg-source can't. When we try, we createa
source package which doesn't represent our git tree.
However, dpkg-source can *apply* such patches if they already exist.
In #949675, there was an *existing* patch with this property.
We don't test for this separately, and never have. Instead, I propose
to make all dpkg-source-applicable patches creatable by dgit.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We are going to want to run these tests in different modes, and the
results might vary between mode.
So encode the expected results in the *arguments* to the sub-test
finish subroutine (which we rename). The filenames go on the sub-test
start subroutine.
finish is going to gain features.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
I wanted this to debug gdr-import-dgitview wrt #1005873.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Closes: #1002927.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
We want to pack everything down, as we're going to commit this stuff
as tarballs into dgit's permanent history !
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Now all the tests pass even with the debhelper that doesn't support 5.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Apparently some of our trees have these already. This stops g-f-b
from working.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Break out git_filter_strip_origs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|