summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* dgit: remove_stray_gits: Print a slightly better messageIan Jackson2016-11-07
| | | | | | Change all call sites, and callers of mktree_in_ud_from_only_subdir. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Cope when an orig tarball is a tarbomb.Ian Jackson2016-11-07
| | | | | | | | | | | | | | | | Ie, if it contains other than one single directory toplevel. Closes:#843422. Specifically: * We change the unpack directory to _unpack-tar in unpack, rather than ../unpack-tar. This means that mktree_in_ud DTRT in that directory, rather than in its supposed only subdiredctory * We do write-tree on the whole tarball. * Then if the tarball had only one subdir in it, we fish the subtree's tree object out of the git tree object. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix an unconditional print that was supposed to be a printdebug:Ian Jackson2016-11-07
| | | | | | origs <blah>.orig.tar.gz f.same=1 #f._differ=-1 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Document multisuiteIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: multisuite: New testIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Actually honour the branch name for $isuite, if we are on dgit branchIan Jackson2016-11-07
| | | | | | As documented in the manpage. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Make clone_set_head not depend on $giturlIan Jackson2016-11-07
| | | | | | | When cloning a distro which has no git server, correctly leave the user on the local dgit branch, not on `master'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Provide reprepro test (for aptget method)Ian Jackson2016-11-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Support the Debian *-security suites.Ian Jackson2016-11-06
| | | | | | (Provide the configuration to use the aptget method.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: aptget archive access methodIan Jackson2016-11-06
| | | | | | | Uses Sources. This is not very efficient and should be avoided for large apt repositories. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: config: Allow dgit-suite.PATTERN.distroIan Jackson2016-11-06
| | | | | | This is going to be useful for *-security. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add fakeroot and make to Test-Depends.Ian Jackson2016-11-01
| | | | | | | | These aren't necessarily pulled in by anything else. (dpkg-dev Recommends build-essential. But we don't actually need build-essential.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.10~Ian Jackson2016-11-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* finalise 2.9archive/debian/2.9Ian Jackson2016-10-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Organise for 2.9Ian Jackson2016-10-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Set urgency to medium - many bugfixesIan Jackson2016-10-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix changelog entry for SIGPIPE to correctly mention Closes:#841090. ↵Ian Jackson2016-10-31
| | | | | | Closes:#841090. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Fix ref to #842577Ian Jackson2016-10-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge branch 'wip.tutorials' into wipIan Jackson2016-10-30
|\
| * dgit(1): Remove obsolete workflow information.Ian Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit(1): Update BUGS sectionIan Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit(1): Reference tutorialsIan Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit(7): Substantial updatesIan Jackson2016-10-30
| | | | | | | | | | | | Including documenting split view. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit-*(7): Sort out Makefile, .gitignore and changelogIan Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Actually provide a -p (--package=) option (!)Ian Jackson2016-10-30
| | | | | | | | | | | | | | | | def02420f6d5 "-p option" abolished various adhocery in command line positional parameter parsing and documented the -p option. But it didn't implement it! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Properly fetch all archive dgit view tags, as we intended.Ian Jackson2016-10-30
| | | | | | | | | | | | | | | | | | | | This deals with the possible "bad object" problem from an in-archive copy. Any such in-archive copy should come with either an update to the suite branch on the dgit-repos server (if maybe it needed a pseudomerge for centrally maintained history), or be identical to the upload's version tag. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Cope when cloning suite which doesn't receive uploads, like testing.Ian Jackson2016-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If $lastpush_hash is '', it means that the dgit git server does not have the suite branch. That can even happen if the current version in the suite was a .dsc with a Dgit field, if an in-archive copy moved the .dsc from whereever it was uploaded. Do not crash in this situation. Instead, give the user the Dgit hash (and maybe pseudomerge it with the user's history - sigh). There is still a possible problem: maybe the referenced commit is on another branch. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: Mention fix for #842386Ian Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Reject `dgit pull' in split view quilt modesIan Jackson2016-10-30
| | | | | | | | | | | | | | To avoid creating unfortunate wreckage on non-dgit-view branches. Closes:#842608. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Test suite: gbp-orig: New test (for #841094)Ian Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit gbp-build will arrange to let gbp buildpackage generate .orig tarballsIan Jackson2016-10-30
| | | | | | | | | | | | if it seems applicable. Closes:#841094. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Support dgit --delayed= pushIan Jackson2016-10-30
| | | | | | | | | | | | (with a warning in the manpage about possible skew). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit clone: Set timestamps in cloned tree to a single unified time.Ian Jackson2016-10-30
| | | | | | | | | | | | | | This makes it less likely that the user will trip over any timestamp-dependent FTBFS bugs (eg #842452). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | New option --dgit-view-save= for split view quilt modes.Ian Jackson2016-10-30
| | | | | | | | | | | | | | In particular, means that the output of a split view quilt-fixup is left somewhere useful. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Test suite: Explicitly configure user.name and user.emailIan Jackson2016-10-30
| | | | | | | | | | | | | | | | | | So that tests work when environment doesn't have defaults. Closes:#842279 (I hope). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Test suite: import-dsc: New testIan Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | import dsc: DocumentationIan Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Properly look for .origs etc. in .., fetching them less often.Ian Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Test suite: orig-include-exclude-chkquery: New testIan Jackson2016-10-30
| | | | | | | | | | | | Check that we make the right file_in_archive ftpmaster API queries. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Test suite: orig-include-exclude: Tests orig auto-inclusion/exclusionIan Jackson2016-10-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Automatically calculate which .origs are requiredIan Jackson2016-10-30
| | | | | | | | | | | | | | * Spot if any of our .origs have different hashes to the archive's * Update the .changes to have the set of .origs that the archive doesn't Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Split brain mode: Fix --new. Closes:#842354.Ian Jackson2016-10-30
|/ | | | | | Test $archive_hash for undef early enough. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.9~Ian Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.8archive/debian/2.8Ian Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: build-mode-*: Check that right .changes comes out.Ian Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* build changes handling: Run mergechanges when needed in non-sbuild build modesIan Jackson2016-10-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd git-apply fallback: defend against debian/patches/series being an ↵Ian Jackson2016-10-25
| | | | | | unusual object, in case dpkg-source doesn't. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 2.8~Ian Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.7archive/debian/2.7Ian Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Provide absurd-gitapply testIan Jackson2016-10-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>