launder: fix

introduce update_head_checkout

Dgit.pm: Break out git_get_symref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

downstream-rebase-launder-v0 first cut

classificaton generates Changelog type

introduce DS_DEB

differentiate changelog from other diffs in get_differ
no change to classification output

also fix a $_ eq m{...} bug!

classify: tolerate backwards breakwater merges

classify: introduce $prevbrw (nfc)

wip fixes for new no global $playground

wip, before abolish Dgit.pm's  global

WIP FOUND

fixes

git-debrebase; get_commit: use new $etype

fixes

wip debug, fixes etc.

wip fixes

finish get_differs ?

wip

move --name-only

allow opts

avoid renames

wip

wip

WIP FOUND

rebase fixes

rebase: go back to my $build

We never don't have exactly one parent

fixes

introduce build_start

abolish recursion

rewrite in brw_cl too

rename @upp_cl @brw_cl $wantbrwonly

wip

wip rebase fixes

wip found

pseudocode typo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

wip, redoing origin handling

wip import handling etc.

fix README typo

git-debrebase fixes

git-debrebase fixes

git-debrebase fixes

sort out report, and walk, allegedly

abolish $pseudos_must_overwrite_this

spelling

wip pseudomerge handling

wip found

wip

abolish abbrev thing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

found

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

README.git-debrebase: diagrams of how to handle imports

README tidy up

README.git-debrebase: both emails

wip: README

wip

wip, found

wip, launder rm patches

wip gitattrs dealt with

remove an xxx

wip

wip comments

wip notes

wip notes

capture breakwater tip

avoid rewrite better

avoid rewrite

WIP command line comments

WIP, new new-upstream

git-debrebase WIP minimal executable ?

WIP

WIP

WIP

WIP

WIP

WIP classification core done?

WIP before reorgs?

git-debrebase: Stub script to prove config handling works

Tested with
  PATH=$PWD:$PATH git -c wombat.foo.bar=23 -c wombat.foo.bar=37 debrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Dgit.pm: git_cat_file: Introduce $etype parameter

No functional change for existing callers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Dgit.pm: Move $playground global to dgit.

It makes the interface to the playground functions confusing.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: document Sean's changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Fix trailing whitespace

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

changelog: Fix typo

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

changelog: start 4.2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: finalise 4.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Document test suite changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: gitworktree: Test quiltification

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: gitworktree: Add some more operations

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: dpkgsourceignores-correct: Test that the rune DTRT

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: dpkg_source_ignores: Exclude the right set of things

Change the dpkg-source -i argument to exclude exactly the right set of
things.  (Sadly this is not a simple rune.)

Previously we might exclude `foo.git', for example !

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Properly shellquote --git-builder argument to gbp

This is about to contain more exciting shell metacharacters.
(Even now, it is wrong without quoting as we end up telling gbp to
pass -i.git/ rather than -i\.git/ to dpkg-source.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: dpkgsourceignores-docs: Use print-dpkg-source-ignores

Rather than fishing the value out of the in-tree dgit source code.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: print-dpkg-source-ignores action

New print-dpkg-source-ignores option to print the big rune you need to
pass to dpkg-source to make it work exactly the right.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: dpkgsourceignores-docs: Check dgit-maint-merge(7) -i -I rune

Check that the rune we document is the same as dgit actually uses.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-maint-merge(7): Add ' ' around -i\.git/

This manpage should present a shell rune, not a half-quoted thing
whose interpretation is left as a tricky exercise to othe reader.

The ' ' protect the \ so that it would actually get passed to
dpkg-buildpackage.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit-maint-merge(7): Reformat slightly

Introduce semantic newlines around the dpg-buildpackage -i -I
rune.  This will make it easier to test.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dgit: Break out -i -I rune into a variable

There is also an instance in dgit-maint-merge.7.pod but that's
trickier to unify.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: Break out t-dgit-manpage

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: stunt gnupg: Much better logging of race errors

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: stunt gnupg runs gpg again if it exits status 2

Work around gnupg agent connection races by having our stunt gpg
wrapper simply try running gpg again, once, if it exits 2.
This does not fully suppress the bug but it does significantly reduce
the probability.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

test suite: Make t-dgit print pwd to stderr, not stdout

This means that tests can capture the output from t-dgit without going
wrong.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Document worktree support

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>