chiark / gitweb /
Ian Jackson [Mon, 17 Oct 2016 23:47:40 +0000 (00:47 +0100)]
Test suite: ovewrite-version: Add missing "echo ok."
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 Oct 2016 23:28:09 +0000 (00:28 +0100)]
pseudomerge: In non-splitbrain, do not look at previous tags
We only want to know: is the current archive version what was
specified in --overwrite=VERSION, or mentioned in the changelog with
--overwrite (without VERSION). In that case we want to overwrite
whatever it is, even if the tags are missing or broken.
Prompted by #841101.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 Oct 2016 23:27:44 +0000 (00:27 +0100)]
changelog: Start 2.3
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 Oct 2016 16:31:38 +0000 (17:31 +0100)]
changelog: Finalise 2.2
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 Oct 2016 16:24:18 +0000 (17:24 +0100)]
Detect SIGPIPE (and SIGCHLD) being blocked or ignored. Closes:#841085.
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>
Ian Jackson [Mon, 17 Oct 2016 15:57:30 +0000 (16:57 +0100)]
debian config; actually make split brain mode work. Closes:#841085.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 18:05:34 +0000 (19:05 +0100)]
changelog: Finalise 2.1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 17:34:40 +0000 (18:34 +0100)]
Test suite: Add test that #840989 is fixed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 17:32:20 +0000 (18:32 +0100)]
dgit: Import handling Do not crash due in clone
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>
Ian Jackson [Sun, 16 Oct 2016 12:07:59 +0000 (13:07 +0100)]
Test suite: Filter out .../git-core from PATH so that we catch git-foo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:56:46 +0000 (12:56 +0100)]
changelog: Document git- prefix changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:55:08 +0000 (12:55 +0100)]
git- prefixes: Test suite: fix tests/tests/quilt
Broken since
20ee7135bcbb "Test suite: quilt: Test that our patch
makes it through dgit and gbp pq".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:53:59 +0000 (12:53 +0100)]
git- prefixes: Test suite: Fix t-gbp-example-prep
Broken ever since it was introduced.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:52:32 +0000 (12:52 +0100)]
git- prefixes: Fix dgit-repos-policy-debian
Use `git for-each-ref' instead of `git-for-each-ref'.
Broken in
8a178bf100d4 "Tag change: Update dgit-repos-policy-debian".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:52:01 +0000 (12:52 +0100)]
git- prefixes: Change `git-foo' to `git foo' in messages
No change other that to error messages, debug output, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:51:08 +0000 (12:51 +0100)]
git- prefixes: Change `git-foo' to `git foo' in docs and comments
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 12:10:59 +0000 (13:10 +0100)]
changelog: start 2.0
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:16:14 +0000 (12:16 +0100)]
changelog: Finalise 2.0
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 11:12:04 +0000 (12:12 +0100)]
dgit: Improve two error messages relating to .changes handling and sbuild
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 16 Oct 2016 10:46:12 +0000 (11:46 +0100)]
changelog: Prepare for 2.0 (~~ right now)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 23:06:37 +0000 (00:06 +0100)]
Test suite: Do not fail when git requires --allow-unrelated-histories.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 20:06:02 +0000 (21:06 +0100)]
Test suite: stunt parsechangelog: Some commented-out debugging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 20:05:07 +0000 (21:05 +0100)]
Test suite: tstunt-parsechangelog: Produce Timestamp field
Like official one does, nowadays.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 19:37:24 +0000 (20:37 +0100)]
Test suite: unset empty redacted paths
Some programs might treat that as a path of implicitly ".".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 19:34:40 +0000 (20:34 +0100)]
Test suite: Fix entirely-broken tstunt PERLLIB arrangements
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>
Ian Jackson [Sat, 15 Oct 2016 18:58:40 +0000 (19:58 +0100)]
Test suite: tstunt/dpkg-parsechangelog: Do not complain if PERLLIB is empty.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 18:55:08 +0000 (19:55 +0100)]
changelog: Minor tidying-up
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 18:41:11 +0000 (19:41 +0100)]
debian/control: Add missing dependency on Text/Iconv.pm
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>
Ian Jackson [Sat, 15 Oct 2016 18:34:57 +0000 (19:34 +0100)]
debian/control: Add missing dependencies to dgit-infrastructure
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>
Ian Jackson [Sat, 15 Oct 2016 18:32:10 +0000 (19:32 +0100)]
debian/control: Add missing dependency on List::MoreUtils
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 15 Oct 2016 16:50:26 +0000 (17:50 +0100)]
Infra: dgit-infrastructure has, and uses, its own copies of the perl modules
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>
Ian Jackson [Sat, 15 Oct 2016 16:04:33 +0000 (17:04 +0100)]
Infra: Introduce Debian::Dgit::Infra
This is used by all the Perl in dgit-infrastructure.deb.
So far it does nothing, so no functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 13 Oct 2016 17:08:47 +0000 (18:08 +0100)]
Test suite: Add debhelper (>=8) to test suite's global Depends.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 13 Oct 2016 15:45:35 +0000 (16:45 +0100)]
Test suite: quilt-gbp: Check that we do not update user's HEAD
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 13 Oct 2016 15:36:45 +0000 (16:36 +0100)]
Test suite: quilt-splitbrains: Check that we do not update user's HEAD
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 12 Oct 2016 17:21:39 +0000 (18:21 +0100)]
changelog: Tidy up a bit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 12 Oct 2016 17:20:34 +0000 (18:20 +0100)]
dgit.1: Minor clarifications
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 12 Oct 2016 17:19:52 +0000 (18:19 +0100)]
Copyright: Actually provide copy of DCO
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 11 Oct 2016 01:22:08 +0000 (02:22 +0100)]
Copyright: Mention, and provide copy of, DCO
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 11 Oct 2016 01:21:48 +0000 (02:21 +0100)]
Copyright: Add notices to some more of the (larger) files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 10 Oct 2016 01:03:52 +0000 (02:03 +0100)]
dgit: When generating patch filenames from titles, first transliterate them (lossily) to ascii. Closes:#834807.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 10 Oct 2016 00:08:15 +0000 (01:08 +0100)]
TODO.BRANCH: Remove empty file - yay!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 10 Oct 2016 00:07:57 +0000 (01:07 +0100)]
changelog: Mention that we don't set a fetch spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 10 Oct 2016 00:07:30 +0000 (01:07 +0100)]
TODO.BRANCH: Many BTS bugs now fixed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 23:57:48 +0000 (00:57 +0100)]
Test suite: mismatches-contents: New test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 23:54:19 +0000 (00:54 +0100)]
dgit: HEAD/.dsc mismatch error: Much better message
Closes:#809516.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 21:14:48 +0000 (22:14 +0100)]
Test suite: Rename mismatches-dscchanges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 21:08:01 +0000 (22:08 +0100)]
dgit: Get sense of failed clone failed cleanup error reporting check correct.
Closes:#796773.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 20:43:53 +0000 (21:43 +0100)]
Test suite: gitconfig: New test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 20:43:19 +0000 (21:43 +0100)]
dgit: New config option slurping approach
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>
Ian Jackson [Sun, 9 Oct 2016 19:49:24 +0000 (20:49 +0100)]
Test suite: unrepresentable: New test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 19:48:57 +0000 (20:48 +0100)]
Better error message if HEAD contains changes unrepresentable
by `3.0 (quilt)'. Closes:#834618.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 19:46:48 +0000 (20:46 +0100)]
dgit: quilt analysis: quiltify_trees_differ: provide new $unrepres arg
No-one passes this yet, so no functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 19:46:00 +0000 (20:46 +0100)]
dgit: quilt analysis: Print orig and HEAD tree hashes.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 19:44:12 +0000 (20:44 +0100)]
dgit: quilt analysis: Replace H2O with O2H
Right now the direction of the diff does not matter, but soon it will,
and the natural direction is O2H, not O2H. Change all references.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 18:50:16 +0000 (19:50 +0100)]
dgit: Better error message if non-split-brain patch stack no longer applies
(due to new upstream version, or user messing with it). Closes:#833025.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 15:18:36 +0000 (16:18 +0100)]
changelog: Mention #833025 re --quilt=
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 14:41:47 +0000 (15:41 +0100)]
dgit.1: Document the expected form of HEAD for each --quilt= mode.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 14:21:20 +0000 (15:21 +0100)]
dgit.1: Discourage use of the --PROGRAM:OPTION escape hatch.
(Apropos of various bug reports including #800060.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 12:58:41 +0000 (13:58 +0100)]
changelog: Mention #800110
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 12:57:28 +0000 (13:57 +0100)]
Test suite: mismatch: New test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 12:56:57 +0000 (13:56 +0100)]
dgit: Before committing to push, check that .dsc and .changes correspond.
Closes:#800060.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 12:56:00 +0000 (13:56 +0100)]
dgit: Break out @files_csum_info_fields (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 12:55:42 +0000 (13:55 +0100)]
changelog: Mention #800060
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 11:54:24 +0000 (12:54 +0100)]
dgit.1: Clarify the --clean= options' documentation. Closes:#800054.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 11:40:03 +0000 (12:40 +0100)]
Test suite: Test that we pass correct -v to genchanges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 11:37:34 +0000 (12:37 +0100)]
Test suite: stunt Parse.pm: add comment about %options
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 11:11:38 +0000 (12:11 +0100)]
Arrange for the special dgit remote to be skipped by git fetch --all etc.
Closes:#827892.
Not quite the patch from Sean: we want to do this on every fetch, and
we don't overwrite the user's configuration if for some reason they
have set this (hopefully they haven't...)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 10:56:36 +0000 (11:56 +0100)]
Don't break if user has push.followTags=true. Closes:#827878.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 10:54:43 +0000 (11:54 +0100)]
changelog: Fix location of a bugfix entry
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:39:35 +0000 (01:39 +0100)]
Update changelog for fetch spec
Ian Jackson [Sun, 9 Oct 2016 00:38:39 +0000 (01:38 +0100)]
Update changelog for in-archive copies
Ian Jackson [Sun, 9 Oct 2016 00:38:12 +0000 (01:38 +0100)]
Update changelog for --quilt= split brain
Ian Jackson [Sun, 9 Oct 2016 00:37:13 +0000 (01:37 +0100)]
Update changelog for tag format
Ian Jackson [Sun, 9 Oct 2016 00:36:12 +0000 (01:36 +0100)]
Make --quilt=gbp the default for dgit gbp-build.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:33:31 +0000 (01:33 +0100)]
dgit.1: Document --quilt=gbp et al.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:14:58 +0000 (01:14 +0100)]
TODO.BRANCH: Quilt output improved now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:13:41 +0000 (01:13 +0100)]
Test suite: quilt: Test that our patch makes it through dgit and gbp pq
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:13:12 +0000 (01:13 +0100)]
Test suite: quilt: Provide Gbp-pq headers in our new patch test case
And expect dgit to honour them
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:12:37 +0000 (01:12 +0100)]
Quilt output: Honour and strip Gbp-pq headers
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:10:26 +0000 (01:10 +0100)]
Quilt admin commits: Provide [dgit ...] in all of them
With the version number, in general. (These are used during
quiltification of the user's branch, not during import, so they don't
need to be stable.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:08:26 +0000 (01:08 +0100)]
Quilt output: Normalise trailing newlines in commit message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:07:59 +0000 (01:07 +0100)]
Quilt output: Include Date header
Copy this from the commit's author date.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 9 Oct 2016 00:06:32 +0000 (01:06 +0100)]
Quilt output: Produce output like git-format-patch
Do not .-convert the message and stuff it in Description.
Instead, generate a normal-looking patch with From and Subject.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 22:09:49 +0000 (23:09 +0100)]
README.dsc-import: Ship to /usr/share/doc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 22:09:21 +0000 (23:09 +0100)]
README.dsc-import: Document actually-imported approach
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 22:07:10 +0000 (23:07 +0100)]
.gitignore: Add debhelper-build-stamp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 22:02:05 +0000 (23:02 +0100)]
NOTES: Remove obsolete file
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 21:31:23 +0000 (22:31 +0100)]
gbp options: done from TODO.BRANCH
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 21:30:39 +0000 (22:30 +0100)]
gbp options: Document
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 21:30:27 +0000 (22:30 +0100)]
Manpage: Embolden some command option strings
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 21:29:41 +0000 (22:29 +0100)]
gbp options: Honour --gbp-pq instead of --gbp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 21:28:33 +0000 (22:28 +0100)]
gbp options: Provide --gbp-build
And, provide the sub opts_opt_multi_cmd to help with options of this
kind.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 21:19:30 +0000 (22:19 +0100)]
gbp options: Introduce gbp_pq function (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 21:01:12 +0000 (22:01 +0100)]
New import: Tidy up output from gbp pq
gbp pq import can print some warnings if it doesn't like the patches
much. There is no point showing these warnings to the user of `dgit
clone' or `dgit fetch'.
As for the warnings in split brain mode, we will leave those, and
leave them with colour enabled.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 19:21:35 +0000 (20:21 +0100)]
Test suite: import-nonnative: Enhanced and finished
Use t-git-next-date. (Our GIT_AUTHOR_DATE settings were wrong and
therefore ineffective.)
Add a 1.0 with diff test. Add some comments about package format.
Now the test is finished.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 20:53:35 +0000 (21:53 +0100)]
New import: Set GIT_COMMITTER_* and GIT_AUTHOR_*
gbp pq import generates commits which are affected by these (COMMITTER
always and AUTHOR sometimes). But we need imports to be stable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 20:52:42 +0000 (21:52 +0100)]
Split brain: Set GIT_AUTHOR_* too
Sometimes the patches don't have authorship information, in which case
using the caller's is wrong.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 20:39:29 +0000 (21:39 +0100)]
Split brain: .gitignore patch: Slightly better commit message
Don't sort-of-imply that the dgit version is the package version.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 8 Oct 2016 20:56:38 +0000 (21:56 +0100)]
New import: Add dependency on git-buildpackage
Now we may run gbp pq import even if user is not using gbp.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / dgit.git / log