summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| |
| * badcommit-fixup: wip g-f-bIan Jackson2017-01-05
| |
| * badcommit-fixup: before no g-f-bIan Jackson2017-01-05
| |
| * badcommit-fixup: more wipIan Jackson2017-01-05
| |
| * badcommit-fixup wipIan Jackson2017-01-04
| |
| * badcommit-fixup: as found, moving from ..Ian Jackson2015-07-18
|
* changelog: start 2.16~Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.15 (will not be uploaded)Ian Jackson2017-01-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Do not tolerate any stderr output from git-fsckIan Jackson2017-01-05
| | | | | | | | | | We must tolerate notice: HEAD points to an unborn branch (master) notice: No default references which are generated by some of our existing test cases and are pretty much harmless. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Introduce t-expect-fsck-failIan Jackson2017-01-05
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Make expect_fsck_fail contain objidsIan Jackson2017-01-05
| | | | | | This will make it possible to be stricter. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge tag dgit/2.14 into `defence in dgit-repos-server' branchIan Jackson2017-01-05
|\ | | | | | | | | | | | | | | | | | | Fix up semantic conflict: the new git-fsck test (in 2.14) fails on the new broken commits (in the `defence in dgit-repos-server' branch). We need to disable this. Ideally we would make a tighter test, but that's too much to do in a merge. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 2.14debian/2.14archive/debian/2.14Ian Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Document changesIan Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Do not generate bogus commitsIan Jackson2017-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two places in the code where ill-formed commits were generated: both psedumerges. One is in dgit import-dsc, a fairly minor problem. The other is in --overwrite and is very bad because that's an important option. Nothing in git seems to notice, unless you run git-fsck. Even a git server does not, by default. However, some other popular git servers do reject these broken commits. I have tested this changes with git-fsck (by using the test suite patches which follow in this series) and now everything seems fine. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Clean out erroneous reflog in a worktreeIan Jackson2017-01-04
| | | | | | | | | | | | | | | | git-reflog expire --expire-unreachable=now --all Without this, this worktree causes git-fsck to complain! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>