chiark / gitweb /
dgit.git
16 months agogit-debrebase: test suite: gdr-import-dgit: wip
Ian Jackson [Fri, 16 Feb 2018 15:48:06 +0000 (15:48 +0000)]
git-debrebase: test suite: gdr-import-dgit: wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test suite: introduce t-some-changes
Ian Jackson [Fri, 16 Feb 2018 15:13:24 +0000 (15:13 +0000)]
git-debrebase: test suite: introduce t-some-changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test suite: introduce t-dch-commit
Ian Jackson [Fri, 16 Feb 2018 15:09:18 +0000 (15:09 +0000)]
git-debrebase: test suite: introduce t-dch-commit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test suite: gdr-edits: check branch structure after last push
Ian Jackson [Fri, 16 Feb 2018 15:01:03 +0000 (15:01 +0000)]
git-debrebase: test suite: gdr-edits: check branch structure after last push

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test suite: gdr-edits: do a push
Ian Jackson [Fri, 16 Feb 2018 14:55:48 +0000 (14:55 +0000)]
git-debrebase: test suite: gdr-edits: do a push

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test suite: gbp2gdr: fix not-gdr-processable to not modify things
Ian Jackson [Fri, 16 Feb 2018 14:55:34 +0000 (14:55 +0000)]
git-debrebase: test suite: gbp2gdr: fix not-gdr-processable to not modify things

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test suite: gbp2gdr: process incoming
Ian Jackson [Fri, 16 Feb 2018 14:45:18 +0000 (14:45 +0000)]
git-debrebase: test suite: gbp2gdr: process incoming

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: NOTES: another todo
Ian Jackson [Fri, 16 Feb 2018 14:44:59 +0000 (14:44 +0000)]
git-debrebase: NOTES: another todo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test: check branch structure, more
Ian Jackson [Fri, 16 Feb 2018 11:49:44 +0000 (11:49 +0000)]
git-debrebase: test: check branch structure, more

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test: check branch structure
Ian Jackson [Fri, 16 Feb 2018 11:49:05 +0000 (11:49 +0000)]
git-debrebase: test: check branch structure

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: some NOTES
Ian Jackson [Fri, 16 Feb 2018 09:06:06 +0000 (09:06 +0000)]
git-debrebase: some NOTES

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: note some todos for gdr-edits
Ian Jackson [Fri, 16 Feb 2018 09:04:28 +0000 (09:04 +0000)]
test suite: note some todos for gdr-edits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: stitch better
Ian Jackson [Fri, 16 Feb 2018 09:01:38 +0000 (09:01 +0000)]
git-debrebase: stitch better

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: wip stitch
Ian Jackson [Thu, 15 Feb 2018 20:18:24 +0000 (20:18 +0000)]
git-debrebase: wip stitch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: record ffq-prev on rebase
Ian Jackson [Thu, 15 Feb 2018 20:17:12 +0000 (20:17 +0000)]
git-debrebase: record ffq-prev on rebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: break out ffq_prev_branchinfo (nfc)
Ian Jackson [Thu, 15 Feb 2018 20:16:42 +0000 (20:16 +0000)]
git-debrebase: break out ffq_prev_branchinfo (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: fix $/ to be local in cfg (!)
Ian Jackson [Thu, 15 Feb 2018 20:14:18 +0000 (20:14 +0000)]
git-debrebase: fix $/ to be local in cfg (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gdr-edits: more
Ian Jackson [Thu, 15 Feb 2018 19:34:09 +0000 (19:34 +0000)]
test suite: gdr-edits: more

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: do not add -i in default invocation
Ian Jackson [Thu, 15 Feb 2018 19:29:00 +0000 (19:29 +0000)]
git-debrebase: do not add -i in default invocation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gbp2gdr: drop some branches we do not want here
Ian Jackson [Thu, 15 Feb 2018 19:26:55 +0000 (19:26 +0000)]
test suite: gbp2gdr: drop some branches we do not want here

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gdr-edits: wip new test
Ian Jackson [Thu, 15 Feb 2018 19:20:24 +0000 (19:20 +0000)]
test suite: gdr-edits: wip new test

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gbp2gdr: call t-setup-done
Ian Jackson [Thu, 15 Feb 2018 19:20:06 +0000 (19:20 +0000)]
test suite: gbp2gdr: call t-setup-done

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gbp2gdr: drop junk at the end
Ian Jackson [Thu, 15 Feb 2018 19:09:11 +0000 (19:09 +0000)]
test suite: gbp2gdr: drop junk at the end

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gbp2gdr: seems to work now
Ian Jackson [Thu, 15 Feb 2018 19:08:44 +0000 (19:08 +0000)]
test suite: gbp2gdr: seems to work now

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: something to have a salsa (general purpose git) repo
Ian Jackson [Thu, 15 Feb 2018 19:08:17 +0000 (19:08 +0000)]
test suite: something to have a salsa (general purpose git) repo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: check head is clean before starting
Ian Jackson [Thu, 15 Feb 2018 18:54:38 +0000 (18:54 +0000)]
git-debrebase: check head is clean before starting

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups
Ian Jackson [Thu, 15 Feb 2018 18:53:52 +0000 (18:53 +0000)]
git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups

We are going to make get_head check the tree is clean

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: test: use conventional branch names
Ian Jackson [Thu, 15 Feb 2018 16:14:04 +0000 (16:14 +0000)]
git-debrebase: test: use conventional branch names

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: for master branch, check dgit/dgit/sid too
Ian Jackson [Thu, 15 Feb 2018 16:09:14 +0000 (16:09 +0000)]
git-debrebase: for master branch, check dgit/dgit/sid too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: bugfixes to record_ffq_prev
Ian Jackson [Thu, 15 Feb 2018 15:57:38 +0000 (15:57 +0000)]
git-debrebase: bugfixes to record_ffq_prev

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: make cfg optionally take $optional (nfc)
Ian Jackson [Thu, 15 Feb 2018 15:48:14 +0000 (15:48 +0000)]
git-debrebase: make cfg optionally take $optional (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: wip cmd_record_ffq_prev
Ian Jackson [Thu, 15 Feb 2018 15:36:00 +0000 (15:36 +0000)]
git-debrebase: wip cmd_record_ffq_prev

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: provide record_ffq_prev (no callers yet)
Ian Jackson [Thu, 15 Feb 2018 15:35:53 +0000 (15:35 +0000)]
git-debrebase: provide record_ffq_prev (no callers yet)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agodebian/control, git-debrebase: "use fnmatch;"
Ian Jackson [Thu, 15 Feb 2018 15:35:28 +0000 (15:35 +0000)]
debian/control, git-debrebase: "use fnmatch;"

We are going to want this for globbing in the ffq configuration.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: introduce --noop-ok
Ian Jackson [Thu, 15 Feb 2018 15:34:57 +0000 (15:34 +0000)]
git-debrebase: introduce --noop-ok

No actual effect yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: notes re ffq-prev ref name
Ian Jackson [Thu, 15 Feb 2018 13:52:50 +0000 (13:52 +0000)]
git-debrebase: notes re ffq-prev ref name

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: intent re record-ffqrebase
Ian Jackson [Mon, 12 Feb 2018 09:02:12 +0000 (09:02 +0000)]
git-debrebase: intent re record-ffqrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: intent re record-ffrebase
Ian Jackson [Sat, 10 Feb 2018 18:31:27 +0000 (18:31 +0000)]
git-debrebase: intent re record-ffrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gbp2gdr: use -f<tag> rather than --force
Ian Jackson [Sat, 10 Feb 2018 18:15:00 +0000 (18:15 +0000)]
test suite: gbp2gdr: use -f<tag> rather than --force

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: provide -f<tag>
Ian Jackson [Sat, 10 Feb 2018 18:14:44 +0000 (18:14 +0000)]
git-debrebase: provide -f<tag>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: introduce any_fproblems (nfc)
Ian Jackson [Sat, 10 Feb 2018 17:55:22 +0000 (17:55 +0000)]
git-debrebase: introduce any_fproblems (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: introduce tags for fproblems, no use yet
Ian Jackson [Sat, 10 Feb 2018 17:54:32 +0000 (17:54 +0000)]
git-debrebase: introduce tags for fproblems, no use yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: more notes
Ian Jackson [Sat, 10 Feb 2018 17:50:12 +0000 (17:50 +0000)]
git-debrebase: more notes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: note re debrebase push?
Ian Jackson [Sat, 10 Feb 2018 17:40:51 +0000 (17:40 +0000)]
git-debrebase: note re debrebase push?

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: decide: make few pseudomerges, and preserve them
Ian Jackson [Sat, 10 Feb 2018 17:40:41 +0000 (17:40 +0000)]
git-debrebase: decide: make few pseudomerges, and preserve them

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: notes re psuedomerges
Ian Jackson [Sat, 10 Feb 2018 17:39:25 +0000 (17:39 +0000)]
git-debrebase: notes re psuedomerges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: notes
Ian Jackson [Sat, 10 Feb 2018 17:15:43 +0000 (17:15 +0000)]
git-debrebase: notes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: note that we have mostly done the gbp import
Ian Jackson [Sat, 10 Feb 2018 17:14:12 +0000 (17:14 +0000)]
git-debrebase: note that we have mostly done the gbp import

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: insist that breakwater merges are merges
Ian Jackson [Sat, 10 Feb 2018 15:27:56 +0000 (15:27 +0000)]
git-debrebase: insist that breakwater merges are merges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: introduce $claims_to_be_breakwater (nfc)
Ian Jackson [Sat, 10 Feb 2018 15:27:48 +0000 (15:27 +0000)]
git-debrebase: introduce $claims_to_be_breakwater (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: explain why breakwater bases must be merges
Ian Jackson [Sat, 10 Feb 2018 15:27:19 +0000 (15:27 +0000)]
git-debrebase: explain why breakwater bases must be merges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: fix misdetection of breakwater declarations as other pseudomerges
Ian Jackson [Sat, 10 Feb 2018 15:20:10 +0000 (15:20 +0000)]
git-debrebase: fix misdetection of breakwater declarations as other pseudomerges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: rework commit annotations
Ian Jackson [Sat, 10 Feb 2018 15:19:52 +0000 (15:19 +0000)]
git-debrebase: rework commit annotations

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: list tags currently written
Ian Jackson [Sat, 10 Feb 2018 14:21:12 +0000 (14:21 +0000)]
git-debrebase: list tags currently written

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: git-debrebase: turn on debug
Ian Jackson [Sat, 10 Feb 2018 14:15:35 +0000 (14:15 +0000)]
test suite: git-debrebase: turn on debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: bugfixes
Ian Jackson [Sat, 10 Feb 2018 14:15:09 +0000 (14:15 +0000)]
git-debrebase: bugfixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: gbp2gdr: run gdr gbp2debrebase
Ian Jackson [Sat, 10 Feb 2018 12:21:57 +0000 (12:21 +0000)]
test suite: gbp2gdr: run gdr gbp2debrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: wip gbp2debrebase
Ian Jackson [Sat, 10 Feb 2018 12:21:39 +0000 (12:21 +0000)]
git-debrebase: wip gbp2debrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: initial git-debrebase setup attempts - bugfixes
Ian Jackson [Sat, 10 Feb 2018 11:37:55 +0000 (11:37 +0000)]
test suite: initial git-debrebase setup attempts - bugfixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: initial git-debrebase setup attempts
Ian Jackson [Sat, 10 Feb 2018 11:27:30 +0000 (11:27 +0000)]
test suite: initial git-debrebase setup attempts

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agotest suite: infrastructure for testing git-debrebase
Ian Jackson [Sat, 10 Feb 2018 11:27:05 +0000 (11:27 +0000)]
test suite: infrastructure for testing git-debrebase

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: Install it in /usr/bin
Ian Jackson [Sun, 18 Feb 2018 12:04:15 +0000 (12:04 +0000)]
git-debrebase: Install it in /usr/bin

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: fix break out fproblem
Ian Jackson [Fri, 9 Feb 2018 21:54:45 +0000 (21:54 +0000)]
git-debrebase: fix break out fproblem

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: fix several calls to git_cat_file
Ian Jackson [Fri, 9 Feb 2018 21:54:25 +0000 (21:54 +0000)]
git-debrebase: fix several calls to git_cat_file

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: in new-upstream-v0 tolerate planned upstream-combine commits which...
Ian Jackson [Fri, 9 Feb 2018 21:51:04 +0000 (21:51 +0000)]
git-debrebase: in new-upstream-v0 tolerate planned upstream-combine commits which are not necessary *new* upstream (eg gbp import)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: break out fproblem
Ian Jackson [Fri, 9 Feb 2018 21:50:24 +0000 (21:50 +0000)]
git-debrebase: break out fproblem

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: some notes about gbp import
Ian Jackson [Fri, 9 Feb 2018 21:49:54 +0000 (21:49 +0000)]
git-debrebase: some notes about gbp import

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: some notes about gbp import
Ian Jackson [Fri, 9 Feb 2018 21:49:49 +0000 (21:49 +0000)]
git-debrebase: some notes about gbp import

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: docs updates
Ian Jackson [Wed, 31 Jan 2018 18:26:01 +0000 (18:26 +0000)]
git-debrebase: docs updates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: rename NOTES to be more generic
Ian Jackson [Wed, 31 Jan 2018 18:11:17 +0000 (18:11 +0000)]
git-debrebase: rename NOTES to be more generic

16 months agogit-debrebase: provide default rebase action
Ian Jackson [Wed, 31 Jan 2018 16:41:20 +0000 (16:41 +0000)]
git-debrebase: provide default rebase action

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: update_head_postlaunder: print a message, if anything changed
Ian Jackson [Wed, 31 Jan 2018 16:40:58 +0000 (16:40 +0000)]
git-debrebase: update_head_postlaunder: print a message, if anything changed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream-v0: support passing git-rebase options
Ian Jackson [Wed, 31 Jan 2018 16:34:06 +0000 (16:34 +0000)]
git-debrebase: new-upstream-v0: support passing git-rebase options

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream-v0: use update_head_postlaunder
Ian Jackson [Wed, 31 Jan 2018 15:31:28 +0000 (15:31 +0000)]
git-debrebase: new-upstream-v0: use update_head_postlaunder

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: fix changelog manip
Ian Jackson [Wed, 31 Jan 2018 15:31:16 +0000 (15:31 +0000)]
git-debrebase: fix changelog manip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: break out update_head_postlaunder (nfc)
Ian Jackson [Wed, 31 Jan 2018 15:31:02 +0000 (15:31 +0000)]
git-debrebase: break out update_head_postlaunder (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: whitespace
Ian Jackson [Wed, 31 Jan 2018 15:13:04 +0000 (15:13 +0000)]
git-debrebase: whitespace

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream-v0: use make_commit another time (nfc)
Ian Jackson [Wed, 31 Jan 2018 15:12:54 +0000 (15:12 +0000)]
git-debrebase: new-upstream-v0: use make_commit another time (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream-v0 break out make_commit
Ian Jackson [Wed, 31 Jan 2018 15:09:19 +0000 (15:09 +0000)]
git-debrebase: new-upstream-v0 break out make_commit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream-v0 bugfixes
Ian Jackson [Wed, 31 Jan 2018 15:02:56 +0000 (15:02 +0000)]
git-debrebase: new-upstream-v0 bugfixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: break out dd (nfc)
Ian Jackson [Wed, 31 Jan 2018 14:57:57 +0000 (14:57 +0000)]
git-debrebase: break out dd (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: walk: print some more debug
Ian Jackson [Tue, 30 Jan 2018 19:08:05 +0000 (19:08 +0000)]
git-debrebase: walk: print some more debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify
Ian Jackson [Tue, 30 Jan 2018 19:07:48 +0000 (19:07 +0000)]
git-debrebase: parsecommit: fix confusing wrong handedness in breakwater merge classify

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: parsecommit: fix Ix to not be off-by-one
Ian Jackson [Tue, 30 Jan 2018 19:07:24 +0000 (19:07 +0000)]
git-debrebase: parsecommit: fix Ix to not be off-by-one

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream-v0: fixes
Ian Jackson [Tue, 30 Jan 2018 18:46:41 +0000 (18:46 +0000)]
git-debrebase: new-upstream-v0: fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: launder: print last upstream merge too
Ian Jackson [Tue, 30 Jan 2018 18:46:33 +0000 (18:46 +0000)]
git-debrebase: launder: print last upstream merge too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: drop d/patches from all laundered commits
Ian Jackson [Tue, 30 Jan 2018 18:46:20 +0000 (18:46 +0000)]
git-debrebase: drop d/patches from all laundered commits

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream-v0: use last upstream merge in breakwater branch
Ian Jackson [Tue, 30 Jan 2018 18:30:56 +0000 (18:30 +0000)]
git-debrebase: new-upstream-v0: use last upstream merge in breakwater branch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: walk: return last upstream merge in breakwater branch
Ian Jackson [Tue, 30 Jan 2018 18:30:44 +0000 (18:30 +0000)]
git-debrebase: walk: return last upstream merge in breakwater branch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: bugfix
Ian Jackson [Tue, 30 Jan 2018 18:30:13 +0000 (18:30 +0000)]
git-debrebase: bugfix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: BUG due to some evidently unfinished code
Ian Jackson [Tue, 30 Jan 2018 18:29:58 +0000 (18:29 +0000)]
git-debrebase: BUG due to some evidently unfinished code

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: syntax fixes
Ian Jackson [Tue, 30 Jan 2018 17:00:05 +0000 (17:00 +0000)]
git-debrebase: syntax fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: wip new-upstream, ready for testing
Ian Jackson [Thu, 25 Jan 2018 15:58:40 +0000 (15:58 +0000)]
git-debrebase: wip new-upstream, ready for testing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream wip
Ian Jackson [Wed, 24 Jan 2018 17:09:07 +0000 (17:09 +0000)]
git-debrebase: new-upstream wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: new-upstream wip
Ian Jackson [Wed, 24 Jan 2018 16:35:30 +0000 (16:35 +0000)]
git-debrebase: new-upstream wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: add --force option (no users, so nfc)
Ian Jackson [Wed, 24 Jan 2018 16:35:10 +0000 (16:35 +0000)]
git-debrebase: add --force option (no users, so nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: break out read_tree_subdir (nfc)
Ian Jackson [Wed, 24 Jan 2018 16:34:25 +0000 (16:34 +0000)]
git-debrebase: break out read_tree_subdir (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: break out rm_subdir_cached (nfc)
Ian Jackson [Wed, 24 Jan 2018 16:30:45 +0000 (16:30 +0000)]
git-debrebase: break out rm_subdir_cached (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: wip new-upstream
Ian Jackson [Tue, 23 Jan 2018 17:32:29 +0000 (17:32 +0000)]
git-debrebase: wip new-upstream

before needing to unpick multi-upstream

also realise need to parse breakwater to check we are not ff only due to combination merge

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
16 months agogit-debrebase: fix: document that breakwater merges always have single parent
Ian Jackson [Tue, 23 Jan 2018 15:20:02 +0000 (15:20 +0000)]
git-debrebase: fix: document that breakwater merges always have single parent

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