| Commit message (Collapse) | Author | Age |
... | |
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
| |
We must tolerate
notice: HEAD points to an unborn branch (master)
notice: No default references
which are generated by some of our existing test cases and are pretty
much harmless.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This will make it possible to be stricter.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There were two places in the code where ill-formed commits were
generated: both psedumerges.
One is in dgit import-dsc, a fairly minor problem.
The other is in --overwrite and is very bad because that's an
important option.
Nothing in git seems to notice, unless you run git-fsck. Even a git
server does not, by default. However, some other popular git servers
do reject these broken commits.
I have tested this changes with git-fsck (by using the test suite
patches which follow in this series) and now everything seems fine.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| | |
git-reflog expire --expire-unreachable=now --all
Without this, this worktree causes git-fsck to complain!
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
No functional change.
perl -i~ -pe 's/^echo ok\.$/t-ok/' tests/tests/*[^~]
perl -i~ -pe 's/^echo ok\.$/t-ok/' tests/setup/*[^~]
perl -i~ -pe 's/^echo done\.$/t-ok/' tests/tests/*[^~]
perl -i~ -pe 's/^echo done\.$/t-ok/' tests/setup/*[^~]
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>
|
| |
| |
| |
| |
| |
| |
| | |
Right now, this causes the test `debpolicy-quilt-gbp' to fail,
because in this branch #849041 is unfixed.
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>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Thanks Felipe Sateler for the bug report.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
|
|
|
|
|
|
| |
In particular, do not fail utterly if dpkg-source and gbp
disagree. Closes:#848843.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Print the git old and new modes too.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
By psssing --include-removal to dpkg-source, and tolerating it when we
do our quilt fixup analysis.
dpkg-source has supported this since at least stretch.
Closes:#848901.
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>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A .dsc containing patches which patch files multiple times would be
rejected by dpkg-source due to #848611.
Work around this by arranging for the patch of interest to never be
the first patch, by introducing (and then evaporating) a dummy patch.
Yuk.
Closes:#848391.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
during .dsc import. Apropos of #848391.
gbp swallows the error from the first run (without --whitespace=fix).
Previously only that first run would do anything useful; the second
would complain about --whitespace=fix. So failures of dpkg-source
would always produce a useless error message.
Instead, tolerate (and ignore) the --whitespace=fix option which gbp
passes during the second run. This means that the second run tries to
do the actual work.
This only does extra work if the first run failed, and since the first
and second runs are now equivalent, that happens when the second run
fails too. But in return for that extra work, we get a report which
actually mentions something that unexpectedly went wrong.
(The alternative would be to have absurd/git try to stash and then
reproduce its previous error, or to make more fragile assumptions
about gbp's behaviour.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Honour DGIT_ABSURD_DEBUG, which is set by dgit from $debuglevel.
Also, in dgit, open the output file for append.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Right now this simply replaces all the echo >&2, producing no
significant functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Closes:#848512.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
Even in non-split-view quilt modes. Closes:#844129.
This breaks one of the test suite test cases, so disable it there.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
While we're at it, use a hash %y rather than repeatedly grepping.
No overall functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Closes:#844570.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
If no changes are needed to the package, user may indeed just debsign
and dput. Closes:#844131.
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>
|
| |
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Removes three identical copies of this y/// rune. No functional
change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|