summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Arrange to pass --debug-quick-random to gpg-agent.Ian Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* badcommit-rewrite: Fix operation using installed version of fixup.Ian Jackson2017-01-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Generalise DGIT_TEST_REAL_<FOO> handlingIan Jackson2017-01-08
| | | | | | No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: tests/run-all: Use a bit more cpuIan Jackson2017-01-08
| | | | | | Make allowance for tests that do a bit of downloading or whatever. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.17~ (again)Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.16.2debian/2.16.2archive/debian/2.16.2Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup; In --check mode, exit status 2 if things are not fineIan Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Fix crash when running for 2nd time in bare repo.Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.17~ (again)Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.16.1Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: New mode --check which is readonly.Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.17~Ian Jackson2017-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.16debian/2.16archive/debian/2.16Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Put our version in our rewrite map commit messageIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Skip our own output refsIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Instructions commentIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Shell bug: avoid local=$(....) as it defeats set -eIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: badcommit-rewrite: Check HEAD manipulation is rightIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Do not detach HEAD - this is not neededIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: New test for history-rewritingIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Now seems to workIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Debugging (commented out)Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-core: Provide DGIT_BADCOMMIT_FIXUPIan Jackson2017-01-06
| | | | | | So that tests can test this program. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: t-make-badcommit: Generate a commit we can fix upIan Jackson2017-01-06
| | | | | | | | | | | This is very like a commit generated by #849041. The wrongness is the same. The difference is that it's not in a dgit-generated merge, but the fixup script doesn't care about that. The existing test case which uses this (drs-push-rejects) still sees badness and is therefore still happy. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: BugfixesIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Change name of rewrite map ref (needs an extra / for git)Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Break out t-make-badcommitIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Honour dgit-rewrite-mapIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Provide git_cat_fileIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Implement dgit-rewrite-mapIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Break out filter_updatesIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Remove obsolete variableIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Do update sameness filtering a bit laterIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: Remove failing approachIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: ShipIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-badcommit-fixup: RenameIan Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* badcommit-fixup: Merge from a filtered view of my personal playgroundIan Jackson2017-01-06
|\ | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * badcommit-fixup: remove some debugIan Jackson2017-01-05
| |
| * badcommit-fixup: dummy add seems workingishIan Jackson2017-01-05
| |
| * badcommit-fixup: break out $bareIan Jackson2017-01-05
| |
| * badcommit-fixup: wip dummy commitsIan Jackson2017-01-05
| |
| * badcommit-fixup: wip dummy commitsIan Jackson2017-01-05
| |
| * badcommit-fixup: break out $bareIan Jackson2017-01-05
| |
| * badcommit-fixup: reorganise arg parsingIan Jackson2017-01-05
| |
| * badcommit-fixup: only detach bareIan Jackson2017-01-05
| |
| * badcommit-fixup: fix a git-Ian Jackson2017-01-05
| |
| * badcommit-fixup: seems to workIan Jackson2017-01-05
| |
| * badcommit-fixup: seems to do main thingIan Jackson2017-01-05
| |
| * badcommit-fixup: wipIan Jackson2017-01-05
| |
| * badcommit-fixup: wip g-f-bIan Jackson2017-01-05
| |