summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* Test suite: Introduce setup/gnupgIan Jackson2016-10-22
| | | | | | | To work around #841143 and improve performance by amortising gnupg migration cost. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: setup import: Cope with nested and multiple importsIan Jackson2016-10-22
| | | | | | | | | | Name the IMPORT file after the setup name. This is important when running under autopkgtest, where all the setups share the tmp directory with each other and with the main test. The setups need distinct IMPORTS. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/changelog: Document dgit-maint-merge(7)Ian Jackson2016-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/copyright: add myselfSean Whitton2016-10-20
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 2.5Ian Jackson2016-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.4debian/2.4Ian Jackson2016-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Document which --ch: options are a good idea.Ian Jackson2016-10-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* split brain cache: Add a dummy ref update when necessaryIan Jackson2016-10-20
| | | | | | | | | | | | | | | git-update-ref does not make a new reflog entry if the ref is not actually being changed. This can mean that `dgit build' might fail to find a good cache entry, but also fail to generate one that push will accept. In this case, generate a dummy reflog update. We make a spurious child of the $dgitview, as that's straightforward. Giving it the same tree and a parent means that human use of reflog commands will produce empty results rather than lots of confusing output. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* split brain cache: Fix a wrong implicit reference to $_. Closes:#841383.Ian Jackson2016-10-20
| | | | | | | | | Otherwise we can get: Use of uninitialized value $_ in pattern match (m//) at /usr/bin/dgit line 4364. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit gbp-build: No longer invent a --git-debian-branch option.Ian Jackson2016-10-18
| | | | | | | | Usually the user is a maintainer using split brain, and we should rely on their own gbp configuration to specify the right check. Closes:#841100. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 2.4Ian Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.3debian/2.3Ian Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document fixes to #841101Ian Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: overwrite-splitbrains: New testIan Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* pseudomerge: When generating pseudomerge in quilt split brain mode due to ↵Ian Jackson2016-10-18
| | | | | | --overwrite, actually include the version number in the commit message. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: ovewrite-junk: New testIan Jackson2016-10-18
| | | | | | Check that we can overwrite things even if the tags are broken. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 2.3Ian Jackson2016-10-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.2debian/2.2Ian Jackson2016-10-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Detect SIGPIPE (and SIGCHLD) being blocked or ignored. Closes:#841085.Ian Jackson2016-10-17
| | | | | | | | In fact, it seems in my test that Perl resets SIGCHLD itself, printing something to stderr, so that trip does not actually fire. But it makes sense to keep it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian config; actually make split brain mode work. Closes:#841085.Ian Jackson2016-10-17
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.1archive/debian/2.1Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add test that #840989 is fixedIan Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Import handling Do not crash due in cloneIan Jackson2016-10-16
| | | | | | | | | | | Previously we failed to handle dpkg-parsechangelog SIGPIPE. Closes:#840989. Fixes: dgit: failed command: dpkg-parsechangelog --format rfc822 --all dgit: subprocess died due to fatal signal PIPE Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Filter out .../git-core from PATH so that we catch git-fooIan Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document git- prefix changesIan Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.0Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 2.0archive/debian/2.0Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Prepare for 2.0 (~~ right now)Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Do not fail when git requires --allow-unrelated-histories.Ian Jackson2016-10-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: tstunt-parsechangelog: Produce Timestamp fieldIan Jackson2016-10-15
| | | | | | Like official one does, nowadays. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Fix entirely-broken tstunt PERLLIB arrangementsIan Jackson2016-10-15
| | | | | | | | | | | | Specifically: * Properly dereference the variable when looking for the stunt dir to be there already * Do not add "." to the path if the path starts out empty. * Crash _with the right message_ in dpkg-parsechangelog if PERLLIB is unset. (PERLLIB mustn't be unset because we're trying to strip our own value from it.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: tstunt/dpkg-parsechangelog: Do not complain if PERLLIB is empty.Ian Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Minor tidying-upIan Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control: Add missing dependency on Text/Iconv.pmIan Jackson2016-10-15
| | | | | | | This was broken by 66a602dbe193 "dgit: When generating patch filenames from titles, first transliterate them (lossily) to ascii." Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control: Add missing dependencies to dgit-infrastructureIan Jackson2016-10-15
| | | | | | | | Now it doesn't Depend: dgit, it needs its own copies of these two. I have done git grep '^use' and it seems that these are the only ones that are needed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control: Add missing dependency on List::MoreUtilsIan Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Infra: dgit-infrastructure has, and uses, its own copies of the perl modulesIan Jackson2016-10-15
| | | | | | | | This avoids introducing a versioned dependency between dgit and dgit-infrastructure (and also makes it easier to test cross-version compatibility). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add debhelper (>=8) to test suite's global Depends.Ian Jackson2016-10-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Tidy up a bitIan Jackson2016-10-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Copyright: Mention, and provide copy of, DCOIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Copyright: Add notices to some more of the (larger) filesIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: When generating patch filenames from titles, first transliterate them ↵Ian Jackson2016-10-11
| | | | | | (lossily) to ascii. Closes:#834807. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention that we don't set a fetch specIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: mismatches-contents: New testIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: HEAD/.dsc mismatch error: Much better messageIan Jackson2016-10-11
| | | | | | Closes:#809516. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Rename mismatches-dscchangesIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Get sense of failed clone failed cleanup error reporting check correct.Ian Jackson2016-10-10
| | | | | | Closes:#796773. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: gitconfig: New testIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: New config option slurping approachIan Jackson2016-10-10
| | | | | | | | | Allows local git config options to override user-global ones, as is proper. Closes:#835858. Also, we now need to handle -c options ourselves. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: unrepresentable: New testIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>