| 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>
|
|
|
|
|
|
| |
Except in case of error. Closes:#901809.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
As discussed on debian-ci. Bug report to request documentation for
this in the autopkgtest spec is TBD.
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Add -working-tree-encoding to $negate_harmful_gitattrs.
* Add new arrangements for updating an existing dgit-defuse-attrs
macro definition:
- is_gitattrs: say whether the macro is up to date
- setup_gitattrs: update an existing out-of-date macro
- minor message changes
- document the new behaviour
One consequence is that we have had to breach the promise about how to
stop future dgit setup-new-tree runs messing with this: it is now
necessary to disapply the macro, rather than redefine it.
Closes:#901900.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
* is_gitattrs_setup: Break out $gitattrs_ourmacro_re
* is_gitattrs_setup: Reorganise very slightly
* is_gitattrs_setup: Add a debug print
* setup_gitattrs: Introduce $new
* setup_gitattrs: Add a blank line
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
Part of the fix to #901900. This suppresses the sort-of-spurious test
failure which occurs because the working-tree-encoding attribute is
discovered and then set to an inappropriate value.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
Put a UTF-8 BOM in the middle of the test files, and some gitattribute
settings for working-tree-encoding. `ISO-8859-1' produces file
corruption. `UTF-16' produces an error since it doesn't specify BE or
LE, and the file lacks a BOM at the start.
Part of the fix to #901900. This introduces the desired test failure.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Multi-piece combine commits may have n or n+1 parents, depending on
whether the previous new-upstream invocation was snag-free.
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>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
| |
This UI is pretty good now, I think, for single-piece upstreams.
For multi-piece ones, which are quite tricky anyway, it is tolerable,
and we it doesn't steal much of the available syntax space. So we
don't need the -v0 any more.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
This will avoid linewrap from `man dgit' in an 80-column terminal,
when we introduce a reference to dgit-maint-debrebase.
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>
|
| |
| |
| |
| |
| | |
Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| |
| |
| | |
and nothing else
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|
| |
| |
| |
| | |
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
|