chiark / gitweb /
Ian Jackson [Wed, 19 Oct 2016 21:54:47 +0000 (22:54 +0100)]
Dgit.pm: failedcmd_report_cmd: Break out of failedcmd
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 21:44:28 +0000 (22:44 +0100)]
curl invocation: archive-api-query subcommand: pass -f to curl
This makes it fail properly when it should.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 21:39:48 +0000 (22:39 +0100)]
curl invocation: Always honour @curl
Use --curl= and --curl: in ftpmaster api queries and in http git
checks.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 21:37:34 +0000 (22:37 +0100)]
curl invocation: Remove -f from @curl, and add it at the call site
No significant functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 Oct 2016 12:29:48 +0000 (13:29 +0100)]
changelog: Start 2.6~
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 Oct 2016 12:20:37 +0000 (13:20 +0100)]
changelog: finalise 2.5
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 Oct 2016 12:02:59 +0000 (13:02 +0100)]
Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 Oct 2016 11:58:11 +0000 (12:58 +0100)]
changelog: Tidy up
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 23 Oct 2016 11:52:19 +0000 (12:52 +0100)]
solit brain: Do not crash in when the two brains are actually identical.
The dgit-view ref is created by quiltify_splitbrain_needed, which is
not always called. But, quiltify_splitbrain_needed's other function
is to switch branches. If it was called then HEAD will refer to
dgit-view. If it wasn't then the original HEAD is fine.
Closes:#841770.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 Oct 2016 10:16:36 +0000 (11:16 +0100)]
default config: Switch to new archive/ tag format
Even in non-split-brain mode.
Also change the test suite to expect this.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 Oct 2016 16:55:34 +0000 (17:55 +0100)]
Test suite: overwrite junk: Use $tagpfx where applicable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 Oct 2016 15:17:44 +0000 (16:17 +0100)]
Test suite: Introduce setup/gnupg
To work around #841143 and improve performance by amortising gnupg
migration cost.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 Oct 2016 18:44:02 +0000 (19:44 +0100)]
Test suite: Propagate tmpbase into nested (setup) runs
This stops t-setup-import wrongly deciding we are in ADT non-shared
mode.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 22 Oct 2016 18:02:03 +0000 (19:02 +0100)]
Test suite: setup import: Cope with nested and multiple imports
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>
Ian Jackson [Fri, 21 Oct 2016 22:07:11 +0000 (23:07 +0100)]
dgit-maint-merge(7): Add paragraph split
Suggested-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Thu, 20 Oct 2016 02:52:18 +0000 (19:52 -0700)]
dgit-maint-merge(7): Move remarks on upstream orig
See discussion in #840153.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Sean Whitton [Thu, 20 Oct 2016 02:51:58 +0000 (19:51 -0700)]
dgit-maint-merge(7): Tweak wording
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Ian Jackson [Wed, 19 Oct 2016 20:23:04 +0000 (21:23 +0100)]
debian/changelog: Document dgit-maint-merge(7)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 17:29:28 +0000 (18:29 +0100)]
dgit-maint-merge(7): Fiercer instructions about legally dangerous git history
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 17:29:09 +0000 (18:29 +0100)]
dgit-maint-merge(7): Fix a typo "upsteram"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 17:28:26 +0000 (18:28 +0100)]
dgit-maint-merge(7): Mention what to do if upstream make good tarballs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 20:15:04 +0000 (21:15 +0100)]
Manpages: Add note about other contributors to dgit-maint-merge(7)
I am going to edit this manpage myself in a moment. In general we
don't want to have to update the AUTHOR section manually.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Wed, 19 Oct 2016 00:36:10 +0000 (17:36 -0700)]
Manpage: add dgit-maint-merge(7) to SEE ALSO
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Sean Whitton [Wed, 19 Oct 2016 00:22:49 +0000 (17:22 -0700)]
debian/copyright: add myself
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Wed, 19 Oct 2016 00:22:49 +0000 (17:22 -0700)]
Manpage: add dgit-maint-merge.7.pod
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Sean Whitton [Wed, 19 Oct 2016 00:20:27 +0000 (17:20 -0700)]
Makefile: build and clean prospective *.7.pod
Build the pod section 7 manpages in "make all"; and install them,
There aren't any yet, so this does nothing.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 Oct 2016 19:06:33 +0000 (20:06 +0100)]
changelog: Start 2.5
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 Oct 2016 15:32:09 +0000 (16:32 +0100)]
changelog: Finalise 2.4
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 Oct 2016 20:40:45 +0000 (21:40 +0100)]
dgit(1): Document which --ch: options are a good idea.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 Oct 2016 14:55:57 +0000 (15:55 +0100)]
split brain cache: Add a dummy ref update when necessary
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>
Ian Jackson [Thu, 20 Oct 2016 14:55:05 +0000 (15:55 +0100)]
split brain cache: Use git log -g
git-reflog is
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 Oct 2016 14:05:59 +0000 (15:05 +0100)]
split brain cache: Fix a wrong implicit reference to $_. Closes:#841383.
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>
Ian Jackson [Thu, 20 Oct 2016 14:04:28 +0000 (15:04 +0100)]
dgit-cache reflog: Make note in comment about --create-reflog
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 Oct 2016 18:01:26 +0000 (19:01 +0100)]
dgit gbp-build: No longer invent a --git-debian-branch option.
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>
Ian Jackson [Tue, 18 Oct 2016 17:59:56 +0000 (18:59 +0100)]
changelog: Start 2.4
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 Oct 2016 00:58:16 +0000 (01:58 +0100)]
changelog: Finalise 2.3
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 Oct 2016 00:40:24 +0000 (01:40 +0100)]
changelog: Document fixes to #841101
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 Oct 2016 00:35:59 +0000 (01:35 +0100)]
Test suite: overwrite-splitbrains: New test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 Oct 2016 00:33:38 +0000 (01:33 +0100)]
pseudomerge: Suppress checks in split brain mode with --overwrite
If the user has specified an appropriate --overwrite (=VERSION with
the archive's version, or without a version and the archive's version
being in debian/changelog), do not do all the automatic checks.
Instead, in this case, simply make the dgit view be a descendant of
the archive, as instructed.
Closes:#841101.
When generating split brain pseudomerge with --overwrite
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 Oct 2016 00:33:12 +0000 (01:33 +0100)]
pseudomerge: When generating pseudomerge in quilt split brain mode due to --overwrite, actually include the version number in the commit message.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 Oct 2016 00:02:41 +0000 (01:02 +0100)]
Test suite: t-gbp-example-prep-no-ff: break out from t-gbp-example-prep
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 Oct 2016 23:56:16 +0000 (00:56 +0100)]
pseudomerge: Abolish confusing $dgitview variable
This seems mostly to have existed to avoid writing `my $cachekey'
separately. It has no separate function from $dgithead AFAICT.
Abolish it. No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 Oct 2016 23:47:54 +0000 (00:47 +0100)]
Test suite: ovewrite-junk: New test
Check that we can overwrite things even if the tags are broken.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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>
~ianmdlvl / dgit.git / log