summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | git-debrebase: wip stitchIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: record ffq-prev on rebaseIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: break out ffq_prev_branchinfo (nfc)Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: fix $/ to be local in cfg (!)Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gdr-edits: moreIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: do not add -i in default invocationIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gbp2gdr: drop some branches we do not want hereIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gdr-edits: wip new testIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gbp2gdr: call t-setup-doneIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gbp2gdr: drop junk at the endIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gbp2gdr: seems to work nowIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: something to have a salsa (general purpose git) repoIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: check head is clean before startingIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookupsIan Jackson2018-06-16
| | | | | | | | | | | | We are going to make get_head check the tree is clean Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: test: use conventional branch namesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: for master branch, check dgit/dgit/sid tooIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: bugfixes to record_ffq_prevIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: make cfg optionally take $optional (nfc)Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: wip cmd_record_ffq_prevIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: provide record_ffq_prev (no callers yet)Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | debian/control, git-debrebase: "use fnmatch;"Ian Jackson2018-06-16
| | | | | | | | | | | | We are going to want this for globbing in the ffq configuration. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: introduce --noop-okIan Jackson2018-06-16
| | | | | | | | | | | | No actual effect yet Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: notes re ffq-prev ref nameIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: intent re record-ffqrebaseIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: intent re record-ffrebaseIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gbp2gdr: use -f<tag> rather than --forceIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: provide -f<tag>Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: introduce any_fproblems (nfc)Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: introduce tags for fproblems, no use yetIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: more notesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: note re debrebase push?Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: decide: make few pseudomerges, and preserve themIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: notes re psuedomergesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: notesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: note that we have mostly done the gbp importIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: insist that breakwater merges are mergesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: introduce $claims_to_be_breakwater (nfc)Ian Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: explain why breakwater bases must be mergesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: fix misdetection of breakwater declarations as other pseudomergesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: rework commit annotationsIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: list tags currently writtenIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: git-debrebase: turn on debugIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: bugfixesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gbp2gdr: run gdr gbp2debrebaseIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: wip gbp2debrebaseIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: initial git-debrebase setup attempts - bugfixesIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: initial git-debrebase setup attemptsIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: infrastructure for testing git-debrebaseIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: Install it in /usr/binIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: fix break out fproblemIan Jackson2018-06-16
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>