summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Chien <jeff@jemstep.com>2020-03-10 13:57:18 +0200
committerJeff Chien <jeff@jemstep.com>2020-03-10 13:57:18 +0200
commit371643f2810bf10b963feed0c9ad8405d3826677 (patch)
treedbdd2af58b029e5782585d0e218bca04ae3bc21a
parentd368da8f096cf79533672c51830527830a37af8f (diff)
PYKE-11910: test-repo additions for rebase test
-rw-r--r--tests/test-repo.git/info/refs2
-rw-r--r--tests/test-repo.git/objects/info/packs1
-rw-r--r--tests/test-repo.git/objects/pack/pack-9555b08a13142095d06c21a03e799895c34ca04e.idxbin0 -> 2080 bytes
-rw-r--r--tests/test-repo.git/objects/pack/pack-9555b08a13142095d06c21a03e799895c34ca04e.pack (renamed from tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.pack)bin7242 -> 8613 bytes
-rw-r--r--tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.bitmapbin870 -> 0 bytes
-rw-r--r--tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.idxbin1968 -> 0 bytes
-rw-r--r--tests/test-repo.git/packed-refs2
7 files changed, 5 insertions, 0 deletions
diff --git a/tests/test-repo.git/info/refs b/tests/test-repo.git/info/refs
index 8acafe8..cce2551 100644
--- a/tests/test-repo.git/info/refs
+++ b/tests/test-repo.git/info/refs
@@ -1,6 +1,8 @@
afe2141ef20abd098927adc66d6728821cb34f59 refs/heads/invalid-author
eef93e7f977c125f92fc78116fc9b881e4055ae8 refs/heads/invalid-merge-with-additions
eb5e0185546b0bb1a13feec6b9ee8b39985fea42 refs/heads/master
+3f48e07e5f8d5ab932a0a298ba3dd52809eef6d2 refs/heads/master-with-revert
+3911fdcbba1621d39096cef1bddbf4b35be2aeb6 refs/heads/merged-with-unrebased-branch
e5924d0748c8852d74049679b34ca4b3b0570d0d refs/heads/multiple-author-in-tag-trunk
6004dfdb071c71e5e76ad55b924b576487e1c485 refs/heads/same-author
6f00838625cd1b7dc0acc66e43fee5594f0f124c refs/heads/tagged-branch
diff --git a/tests/test-repo.git/objects/info/packs b/tests/test-repo.git/objects/info/packs
index 3df4c21..d9f9067 100644
--- a/tests/test-repo.git/objects/info/packs
+++ b/tests/test-repo.git/objects/info/packs
@@ -1,2 +1,3 @@
P pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.pack
+P pack-9555b08a13142095d06c21a03e799895c34ca04e.pack
diff --git a/tests/test-repo.git/objects/pack/pack-9555b08a13142095d06c21a03e799895c34ca04e.idx b/tests/test-repo.git/objects/pack/pack-9555b08a13142095d06c21a03e799895c34ca04e.idx
new file mode 100644
index 0000000..fd93e47
--- /dev/null
+++ b/tests/test-repo.git/objects/pack/pack-9555b08a13142095d06c21a03e799895c34ca04e.idx
Binary files differ
diff --git a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.pack b/tests/test-repo.git/objects/pack/pack-9555b08a13142095d06c21a03e799895c34ca04e.pack
index 8e05e31..ef6dd69 100644
--- a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.pack
+++ b/tests/test-repo.git/objects/pack/pack-9555b08a13142095d06c21a03e799895c34ca04e.pack
Binary files differ
diff --git a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.bitmap b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.bitmap
deleted file mode 100644
index 88f4c7b..0000000
--- a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.bitmap
+++ /dev/null
Binary files differ
diff --git a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.idx b/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.idx
deleted file mode 100644
index 120404f..0000000
--- a/tests/test-repo.git/objects/pack/pack-ce13b28bc6aaf0c8e45f7fd81b8c8239ede8e231.idx
+++ /dev/null
Binary files differ
diff --git a/tests/test-repo.git/packed-refs b/tests/test-repo.git/packed-refs
index 2bef0ff..fd29b87 100644
--- a/tests/test-repo.git/packed-refs
+++ b/tests/test-repo.git/packed-refs
@@ -2,6 +2,8 @@
afe2141ef20abd098927adc66d6728821cb34f59 refs/heads/invalid-author
eef93e7f977c125f92fc78116fc9b881e4055ae8 refs/heads/invalid-merge-with-additions
eb5e0185546b0bb1a13feec6b9ee8b39985fea42 refs/heads/master
+3f48e07e5f8d5ab932a0a298ba3dd52809eef6d2 refs/heads/master-with-revert
+3911fdcbba1621d39096cef1bddbf4b35be2aeb6 refs/heads/merged-with-unrebased-branch
e5924d0748c8852d74049679b34ca4b3b0570d0d refs/heads/multiple-author-in-tag-trunk
6004dfdb071c71e5e76ad55b924b576487e1c485 refs/heads/same-author
6f00838625cd1b7dc0acc66e43fee5594f0f124c refs/heads/tagged-branch