Commit ff25ec83562bf0a2aa714cd6296c93fe6cce3c36
2019-07-21T16:25:11
tests: add a subdirectory to crlf tests Add a subdirectory in the crlf.git bare repository that has a second-level .gitattribute file.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
diff --git a/tests/resources/crlf.git/COMMIT_EDITMSG b/tests/resources/crlf.git/COMMIT_EDITMSG
deleted file mode 100644
index f038034..0000000
--- a/tests/resources/crlf.git/COMMIT_EDITMSG
+++ /dev/null
@@ -1 +0,0 @@
-Add .gitattributes
diff --git a/tests/resources/crlf.git/config b/tests/resources/crlf.git/config
index 8e7c7b4..a8e94d7 100644
--- a/tests/resources/crlf.git/config
+++ b/tests/resources/crlf.git/config
@@ -1,3 +1,13 @@
[core]
repositoryformatversion = 0
- bare = true
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
+ precomposeunicode = true
+[remote "origin"]
+ url = /Users/ethomson/libgit2/libgit2-3/tests/resources/crlf.git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
diff --git a/tests/resources/crlf.git/logs/HEAD b/tests/resources/crlf.git/logs/HEAD
index 3421ae7..44f6651 100644
--- a/tests/resources/crlf.git/logs/HEAD
+++ b/tests/resources/crlf.git/logs/HEAD
@@ -1 +1,2 @@
-5afb6a14a864e30787857dd92af837e8cdd2cb1b 6b9d5748663795f573ea857276eb2a5f8330efa0 Edward Thomson <ethomson@edwardthomson.com> 1561324263 +0100 commit: Add .gitattributes
+0000000000000000000000000000000000000000 6b9d5748663795f573ea857276eb2a5f8330efa0 Edward Thomson <ethomson@edwardthomson.com> 1563721143 +0100 clone: from /Users/ethomson/libgit2/libgit2-3/tests/resources/crlf.git
+6b9d5748663795f573ea857276eb2a5f8330efa0 124f4293444614aa8da53be149792c2e43e9bfd9 Edward Thomson <ethomson@edwardthomson.com> 1563721187 +0100 commit: subdir with no translation
diff --git a/tests/resources/crlf.git/logs/refs/heads/master b/tests/resources/crlf.git/logs/refs/heads/master
index 3421ae7..44f6651 100644
--- a/tests/resources/crlf.git/logs/refs/heads/master
+++ b/tests/resources/crlf.git/logs/refs/heads/master
@@ -1 +1,2 @@
-5afb6a14a864e30787857dd92af837e8cdd2cb1b 6b9d5748663795f573ea857276eb2a5f8330efa0 Edward Thomson <ethomson@edwardthomson.com> 1561324263 +0100 commit: Add .gitattributes
+0000000000000000000000000000000000000000 6b9d5748663795f573ea857276eb2a5f8330efa0 Edward Thomson <ethomson@edwardthomson.com> 1563721143 +0100 clone: from /Users/ethomson/libgit2/libgit2-3/tests/resources/crlf.git
+6b9d5748663795f573ea857276eb2a5f8330efa0 124f4293444614aa8da53be149792c2e43e9bfd9 Edward Thomson <ethomson@edwardthomson.com> 1563721187 +0100 commit: subdir with no translation
diff --git a/tests/resources/crlf.git/logs/refs/remotes/origin/HEAD b/tests/resources/crlf.git/logs/refs/remotes/origin/HEAD
new file mode 100644
index 0000000..6cca825
--- /dev/null
+++ b/tests/resources/crlf.git/logs/refs/remotes/origin/HEAD
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 6b9d5748663795f573ea857276eb2a5f8330efa0 Edward Thomson <ethomson@edwardthomson.com> 1563721143 +0100 clone: from /Users/ethomson/libgit2/libgit2-3/tests/resources/crlf.git
diff --git a/tests/resources/crlf.git/objects/12/4f4293444614aa8da53be149792c2e43e9bfd9 b/tests/resources/crlf.git/objects/12/4f4293444614aa8da53be149792c2e43e9bfd9
new file mode 100644
index 0000000..29c6740
--- /dev/null
+++ b/tests/resources/crlf.git/objects/12/4f4293444614aa8da53be149792c2e43e9bfd9
@@ -0,0 +1,4 @@
+x]
+0})]m/ l--Doo|IJKԡUf`"Ǩ=h쭱Q*.8 0yʹ pBoz p
+HH
+\*ҋj\֭d8s woKX (Z(~3bǴTx-m\UۃRxjU
\ No newline at end of file
diff --git a/tests/resources/crlf.git/objects/e0/be8c0fa467f0a554484347c12802799d6c04fa b/tests/resources/crlf.git/objects/e0/be8c0fa467f0a554484347c12802799d6c04fa
new file mode 100644
index 0000000..b655485
Binary files /dev/null and b/tests/resources/crlf.git/objects/e0/be8c0fa467f0a554484347c12802799d6c04fa differ
diff --git a/tests/resources/crlf.git/objects/ea/a6ce5bc192f4c3c19354e7434c01e4686e95d7 b/tests/resources/crlf.git/objects/ea/a6ce5bc192f4c3c19354e7434c01e4686e95d7
new file mode 100644
index 0000000..e994143
Binary files /dev/null and b/tests/resources/crlf.git/objects/ea/a6ce5bc192f4c3c19354e7434c01e4686e95d7 differ
diff --git a/tests/resources/crlf.git/objects/fa/1385d99a319b43c06f5309d1aae9fdd3adea46 b/tests/resources/crlf.git/objects/fa/1385d99a319b43c06f5309d1aae9fdd3adea46
new file mode 100644
index 0000000..d0dda45
Binary files /dev/null and b/tests/resources/crlf.git/objects/fa/1385d99a319b43c06f5309d1aae9fdd3adea46 differ
diff --git a/tests/resources/crlf.git/packed-refs b/tests/resources/crlf.git/packed-refs
new file mode 100644
index 0000000..33446e7
--- /dev/null
+++ b/tests/resources/crlf.git/packed-refs
@@ -0,0 +1,3 @@
+# pack-refs with: peeled fully-peeled sorted
+9687e444bcbb85645cb496080434c292f1b57182 refs/remotes/origin/empty-files
+6b9d5748663795f573ea857276eb2a5f8330efa0 refs/remotes/origin/master
diff --git a/tests/resources/crlf.git/refs/heads/master b/tests/resources/crlf.git/refs/heads/master
index a35e8be..97c85bc 100644
--- a/tests/resources/crlf.git/refs/heads/master
+++ b/tests/resources/crlf.git/refs/heads/master
@@ -1 +1 @@
-6b9d5748663795f573ea857276eb2a5f8330efa0
+124f4293444614aa8da53be149792c2e43e9bfd9
diff --git a/tests/resources/crlf.git/refs/remotes/origin/HEAD b/tests/resources/crlf.git/refs/remotes/origin/HEAD
new file mode 100644
index 0000000..6efe28f
--- /dev/null
+++ b/tests/resources/crlf.git/refs/remotes/origin/HEAD
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master