Skip to content

Commit

Permalink
Add a test exhibiting how our handling of conflicts affects git-fsck
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed May 10, 2024
1 parent 1e7942c commit 2301281
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions tests/conflicts.t
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ changesets properly.

b\x00 (no-eol) (esc)

$ git clone -q --mirror repo-git repo-mirror
$ git -C repo-mirror cinnabar rollback
$ git -C repo-mirror rev-list --count --all
3
$ git -C repo-mirror gc --prune=now
$ git -C repo-mirror fsck
warning in commit 36376d9e996376d02d00f72a8c7903cef9d6ea45: nulInCommit: NUL byte in the commit object body

Check that this round-trips properly.

$ hg init ${REPO}2
Expand Down

0 comments on commit 2301281

Please sign in to comment.