summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* dgit: gitattributes: Defuse working-tree-encodingIan Jackson2018-06-20
| | | | | | | | | | | | | | | | | | | * 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>
* dgit: gitattributes: Minor refactoring to prep for adding new squashIan Jackson2018-06-20
| | | | | | | | | | | | * 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>
* test suite: gitattributes: Do not try to set working-tree-encoding to trueIan Jackson2018-06-20
| | | | | | | | 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>
* test suite: gitattributes: Test working-tree-encoding suppressionIan Jackson2018-06-20
| | | | | | | | | | | 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>
* git-debrebase: new-upstream: fix ff check handling of multi-piece upstreamsIan Jackson2018-06-20
| | | | | | | 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>
* git-debrebase manpages: Fix typos and etc.Ian Jackson2018-06-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.1~Ian Jackson2018-06-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.0debian/5.0archive/debian/5.0Ian Jackson2018-06-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Delete some obsolete NOTESIan Jackson2018-06-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: git-debrebase: Rename gdr-newupstream-v0 testIan Jackson2018-06-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Rename new-upstream-v0 command to new-upstreamIan Jackson2018-06-17
| | | | | | | | | | 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>
* dgit(1): Refer to dgit-maint-debrebaseIan Jackson2018-06-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Abbreviate some of the tutorial descriptionsIan Jackson2018-06-17
| | | | | | | 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>
* Merge branch 'gdr-manpages' into wip.rebaseIan Jackson2018-06-17
|\
| * dgit-maint-debrebase(7): Add cross-refs to git-debrebase(1) and (5)Ian Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: add dgit-maint-debrebase.7 to .gitignoreIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit-maint-debrebase(7): rewrite "Upstream branches" againSean Whitton2018-04-19
| | | | | | | | | | Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * Makefile: add dgit-maint-debrebase.7 to MAN7PAGESSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-merge(7): recommend dgit-maint-debrebase(7)Sean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): tweak instructions to import DFSG-clean tagSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): add another "# if needed"Sean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): be consistent about referring to the toolSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): downgrade very minimal debrebasing workflow yet furtherSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): improve "Upstream branches"Sean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): further notes about d/patchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): respond to feedback on DFSG-non-free sectionSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): notes about d/patchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): improve advice about minimising stitchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): correct what debrebase will do when debrebasing an NMUSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): drop claims about purpose of branchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): simplify hint about manual rebaseSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): fix debrebase invocationsSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): add "EDITING THE DEBIAN PACKAGING"Sean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): fix desc. of convert-from-gbp cmdSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): respond to feedbackSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): Verifying->ComparingSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): first commit to new package must introduce debian/ ↵Sean Whitton2018-04-19
| | | | | | | | | | | | and nothing else Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): make the wood visible despite the treesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): it's an exampleSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): avoiding mergesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): fix NMUs sectionSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): patch queue -> delta queueSean Whitton2018-04-19
| | | | | | | | | | | | For consistency with git-debrebase(5). Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): add another advantageSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): begin incorporating feedbackSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): first draftSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | test suite: git-debrebase: Do some tests without dgit installedIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We provide a new psuedo-dependency NO-DGIT which throws away the usual default dependency list. We abolish NO-DEFAULT which could not be useful because the tests pretty much all depend on setup/gnupg which (currently, as a workaround for the gnupg2 races) requires chiark-utils-bin for with-lock-ex. There are two tests which don't actually need any interaction with the archive. Mark them accordingly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: Split into its own packageIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Provide and use Debian::Dgit::GDR which does the same for @INC as Debian::Dgit:Infra, only for GDR. It's not *entirely* similar as its doc comment talks about ExitStatus too. * In Makefile, split off lots of GDR_* variables and the two targets install-gdr and installdirs-gdr We take no care that only the required manpages are built for each install target; instead, they all go in MANPAGES and `all'. * Add a control file stanza. git-debrebase takes over the dependenc on libfile-fnmatch-perl. We Recommend dgit and gbp. (Even though if you're working with neither the Debian archive nor `3.0 (quilt)', you need neither.) * In rules, add specpkg_install_gdr, to run the Makefile machinery. * In the test dependencies, GDR now means to ask for git-debrebase and also git-buildpackage (for make-patches). libfile-fnmatch-perl is handled via the dependencies of git-debrebase.deb. * Add a .gitignore for the staging area in debian/ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: git-debrebase: Use gdr-convert-gbp-noarchiveIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gdr-convert-gbp-noarchive: new setup kindIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | | | Introduce $ifnoarchive in gdr-convert-gbp, which allows us to run it without any of the operations which touch the simulated archive. This is faster. Also in the future after we split the packages this will make it possible to run this new setup without having dgit or the archive management tools installed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: Get perl -I for source tree rightIan Jackson2018-06-17
| | | | | | | | | | | | | | | | We wanted the Dgit.pm in the source tree (ie, the test suite's). Previously this would work by accident, because Dgit.pm would be installed in /usr. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 00:54:24 +0000