Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | test suite: gbp2gdr: drop junk at the end | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: gbp2gdr: seems to work now | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: something to have a salsa (general purpose git) repo | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: check head is clean before starting | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups | Ian Jackson | 2018-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 names | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: for master branch, check dgit/dgit/sid too | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: bugfixes to record_ffq_prev | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: make cfg optionally take $optional (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: wip cmd_record_ffq_prev | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: provide record_ffq_prev (no callers yet) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | debian/control, git-debrebase: "use fnmatch;" | Ian Jackson | 2018-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-ok | Ian Jackson | 2018-06-16 |
| | | | | | | No actual effect yet Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: notes re ffq-prev ref name | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: intent re record-ffqrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: intent re record-ffrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: gbp2gdr: use -f<tag> rather than --force | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: provide -f<tag> | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: introduce any_fproblems (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: introduce tags for fproblems, no use yet | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: more notes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: note re debrebase push? | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: decide: make few pseudomerges, and preserve them | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: notes re psuedomerges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: notes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: note that we have mostly done the gbp import | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: insist that breakwater merges are merges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: introduce $claims_to_be_breakwater (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: explain why breakwater bases must be merges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix misdetection of breakwater declarations as other pseudomerges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: rework commit annotations | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: list tags currently written | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: git-debrebase: turn on debug | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: bugfixes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: gbp2gdr: run gdr gbp2debrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: wip gbp2debrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: initial git-debrebase setup attempts - bugfixes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: initial git-debrebase setup attempts | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | test suite: infrastructure for testing git-debrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: Install it in /usr/bin | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix break out fproblem | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix several calls to git_cat_file | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: in new-upstream-v0 tolerate planned upstream-combine commits ↵ | Ian Jackson | 2018-06-16 |
| | | | | | | which are not necessary *new* upstream (eg gbp import) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: break out fproblem | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: some notes about gbp import | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: some notes about gbp import | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: docs updates | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: rename NOTES to be more generic | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: provide default rebase action | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: update_head_postlaunder: print a message, if anything changed | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |