PYKE-11910-Enforce-Rebasing: Added additional test data to test repo

10 files changed, 29 insertions, 1 deletions

diff --git a/readme.org b/readme.org
index 035c2dd..7ade6b9 100644
--- a/readme.org
+++ b/readme.org
@@ -234,6 +234,8 @@ turned on in the configuration passed successfully.
 Some of the end to end tests require a valid Git repository and GPG
 key to run.
 
+*** The test repo
+
 To facilitate this, there is a bare Git repo, set up as a test
 repository, checked in to the tests folder of this repo. It is located
 at [[./tests/test-repo.git]].
@@ -249,10 +251,32 @@ on your drive with
 Make any required commits, and push the changes back. Then commit the
 changes in this repo.
 
+*** GPG keys and the test repo
+
 To create valid commits for these tests, you need to sign the commits
 with the secret key in [[./tests/test-secret-key.asc]]. The password to
 import this key is 'test'.
 
+After you've impored that key into your GPG keyring, it's recommended
+that you change your local git settings in the test repo to use the
+test user and the test GPG key.
+
+#+BEGIN_SRC sh
+  git config user.email "blackhole@jemstep.com"
+  git config user.name "Test User"
+  git config user.signingkey = "0xE1F315E39CCCECAA"
+#+END_SRC
+
+*** Visualising the test repo
+
+The easiest way to visualise the data in the test repo is to use =git
+log=.
+
+#+BEGIN_SRC sh
+  cd <path to test-repo.git>
+  git log --graph --decorate --oneline --all
+#+END_SRC
+
 * License
 
 This software may be used under the conditions of the Apache License.
diff --git a/tests/test-repo.git/info/refs b/tests/test-repo.git/info/refs
index 9220d69..8acafe8 100644
--- a/tests/test-repo.git/info/refs
+++ b/tests/test-repo.git/info/refs
@@ -4,6 +4,8 @@ eb5e0185546b0bb1a13feec6b9ee8b39985fea42	refs/heads/master
 e5924d0748c8852d74049679b34ca4b3b0570d0d	refs/heads/multiple-author-in-tag-trunk
 6004dfdb071c71e5e76ad55b924b576487e1c485	refs/heads/same-author
 6f00838625cd1b7dc0acc66e43fee5594f0f124c	refs/heads/tagged-branch
+318fae0d25bceeb2c5d19a966c4de4c2d9fceae2	refs/heads/unrebased
+6eea56095f7498043f1d3d74bad46056b92675ea	refs/heads/unrebased-merge
 d2e3bfdc923986d04e7a6368b5fdd78b1ddf84f1	refs/heads/unsigned
 e9752e78505f3c9bcec15d4bef4299caf0538388	refs/heads/unsigned-buried-behind-merge
 6754e4ec9b2dec567190d5a7f0be18b1a23d632a	refs/heads/valid-automerge-commit
diff --git a/tests/test-repo.git/objects/info/commit-graph b/tests/test-repo.git/objects/info/commit-graph
index 91f5394..666d43b 100644
--- a/tests/test-repo.git/objects/info/commit-graph
+++ b/tests/test-repo.git/objects/info/commit-graph
diff --git a/tests/test-repo.git/objects/info/packs b/tests/test-repo.git/objects/info/packs
index 0c7c399..3df4c21 100644
--- a/tests/test-repo.git/objects/info/packs
+++ b/tests/test-repo.git/objects/info/packs
@@ -1,2 +1,2 @@
-P pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.pack
+P pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.pack
 
diff --git a/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.bitmap b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.bitmap
deleted file mode 100644
index e4d677a..0000000
--- a/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.bitmap
+++ /dev/null
diff --git a/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.idx b/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.idx
deleted file mode 100644
index 786adde..0000000
--- a/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.idx
+++ /dev/null
diff --git a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.bitmap b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.bitmap
new file mode 100644
index 0000000..88f4c7b
--- /dev/null
+++ b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.bitmap
diff --git a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.idx b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.idx
new file mode 100644
index 0000000..120404f
--- /dev/null
+++ b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.idx
diff --git a/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.pack b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.pack
index 91db953..8e05e31 100644
--- a/tests/test-repo.git/objects/pack/pack-bb0116e43e397fd86cb8f3e00d9d709c11fa3611.pack
+++ b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.pack
diff --git a/tests/test-repo.git/packed-refs b/tests/test-repo.git/packed-refs
index e752539..2bef0ff 100644
--- a/tests/test-repo.git/packed-refs
+++ b/tests/test-repo.git/packed-refs
@@ -5,6 +5,8 @@ eb5e0185546b0bb1a13feec6b9ee8b39985fea42 refs/heads/master
 e5924d0748c8852d74049679b34ca4b3b0570d0d refs/heads/multiple-author-in-tag-trunk
 6004dfdb071c71e5e76ad55b924b576487e1c485 refs/heads/same-author
 6f00838625cd1b7dc0acc66e43fee5594f0f124c refs/heads/tagged-branch
+318fae0d25bceeb2c5d19a966c4de4c2d9fceae2 refs/heads/unrebased
+6eea56095f7498043f1d3d74bad46056b92675ea refs/heads/unrebased-merge
 d2e3bfdc923986d04e7a6368b5fdd78b1ddf84f1 refs/heads/unsigned
 e9752e78505f3c9bcec15d4bef4299caf0538388 refs/heads/unsigned-buried-behind-merge
 6754e4ec9b2dec567190d5a7f0be18b1a23d632a refs/heads/valid-automerge-commit