commit c1738f5fe1cfa94187835cee4ff375e53001657f from: Jelmer Vernooij date: Fri Jul 15 01:54:36 2022 UTC Move testdata out of code directory. commit - 64a1ae22714899eb4237f620a15fa642de198f87 commit + c1738f5fe1cfa94187835cee4ff375e53001657f blob - 1942d238fd2e742022b145383e67863d02862c08 (mode 644) blob + /dev/null Binary files dulwich/tests/data/blobs/11/11111111111111111111111111111111111111 and /dev/null differ blob - 8f8ed37f1e6b8f0af781c26daa8f31ae9bd2167d (mode 644) blob + /dev/null Binary files dulwich/tests/data/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 and /dev/null differ blob - 7bef12912d59b8fab01801f66978456947e6ce59 (mode 644) blob + /dev/null Binary files dulwich/tests/data/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 and /dev/null differ blob - 8c901c5b89f920a740af8b23b771ef4019cdb665 (mode 644) blob + /dev/null Binary files dulwich/tests/data/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 and /dev/null differ blob - b4c3a1d99a4d24753afd83c3e179bd428b24764c (mode 755) blob + /dev/null --- dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 +++ /dev/null @@ -1,2 +0,0 @@ -xK -@])z53׮==-&e=i:"Z=H)r芔>4wYԯMx|q=s)&6Dh6{Ym/LXg? \ No newline at end of file blob - 69c6dff1ab6b88df371b5f539df78e705d1f05a5 (mode 644) blob + /dev/null Binary files dulwich/tests/data/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc and /dev/null differ blob - 9e1d72632e9aa355b6f3efed9aa13f3a1259c426 (mode 644) blob + /dev/null --- dulwich/tests/data/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e +++ /dev/null @@ -1,4 +0,0 @@ -x -0E]+f/N"] g *5"O.υɗia UBERr[P\ʋ -Tz靖-zN0Q -)ZOEv,pIop['lǺ <|fֶk)PGX{&K0 ?yMQ \ No newline at end of file blob - 96f9998c0a1883d2b96b5088650eec063a5d3e97 (mode 644) blob + /dev/null Binary files dulwich/tests/data/indexes/index and /dev/null differ blob - ca0454de928844663ddb20a0369f1d9af0391c72 (mode 644) blob + /dev/null Binary files dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx and /dev/null differ blob - e2754b2777a048fd7e83b22d77a89462c2394d2f (mode 644) blob + /dev/null Binary files dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack and /dev/null differ blob - 26cc331fb8748e2cf588db343a1c2f8242d4b692 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.export eol=lf blob - cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) blob + /dev/null --- dulwich/tests/data/repos/a.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master blob - f13a21bc5735e6b8bcf4423ce6645fcf32a1fafd (mode 644) blob + /dev/null --- dulwich/tests/data/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a +++ /dev/null @@ -1,2 +0,0 @@ -x5A -0a9\@i"" L1T"uPMA7o~2(0H\uB\]MNc+H!0&5Zi-)~ ߓ~ÏsP~Gl֮`јk N0 \ No newline at end of file blob - dfc9847b6f39818fb3a16abd03a52cca8b0488df (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 and /dev/null differ blob - 00d4a694a367c8bef7c4fae99f1f18e6edfa1e53 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec and /dev/null differ blob - 522a3def4bbdd7178cd5f5758fd7f51831e394ea (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 and /dev/null differ blob - 8a8432a9e223891b4250ec4ac8631b55b346017d (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 and /dev/null differ blob - a044c5926c95969c522e5fabc37161ca65232d57 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 and /dev/null differ blob - 7d172f39d4e00239ca900fc7f1b94ee2f145db36 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 and /dev/null differ blob - e8b676a287932c6cce97f02dbf8ae805babc6f72 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 +++ /dev/null @@ -1,3 +0,0 @@ -x-[ -0**I75T[oRWo -w*`e/i7sjpیhjkL[c7L ><2ݏ 1Jr tqصh̰ɾ֥2v \ No newline at end of file blob - 81b997b636b0ddc243de5d5c11eb9e4a93450bf2 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f and /dev/null differ blob - daf2fc46e6e666c83d5da3aeb78a10abdcfd37b1 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/a.git/packed-refs +++ /dev/null @@ -1,3 +0,0 @@ -# pack-refs with: peeled -b0931cadc54336e78a1d980420e3268903b57a50 refs/tags/mytag-packed -^2a72d929692c41d8554c07f6301757ba18a65d91 blob - e28347ea6dc57992bb974ef79daa09d8c760e075 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/a.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a90fa2d900a17e99b433217e988c4eb4a2e9a097 blob - cb5c1106d769d9358863fd29b0d869de55b9ce83 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/a.git/refs/tags/mytag +++ /dev/null @@ -1 +0,0 @@ -28237f4dc30d0d462658d6b937b08a0f0b6ef55a blob - cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) blob + /dev/null --- dulwich/tests/data/repos/empty.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master blob - 90e16477bddfa48ec34154f9d7211aac4e32a511 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/empty.git/config +++ /dev/null @@ -1,7 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = false - bare = true - symlinks = false - ignorecase = true - hideDotFiles = dotGitOnly blob - c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/empty.git/objects/info/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file blob - c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/empty.git/objects/pack/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file blob - c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/empty.git/refs/heads/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file blob - c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/empty.git/refs/tags/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file blob - 48bdc140b6ec1a433f0d765bbb5affb6fd0200a3 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/issue88_expect_ack_nak_client.export +++ /dev/null @@ -1,260 +0,0 @@ -reset refs/heads/master -commit refs/heads/master -mark :1 -author User 1427183369 +1300 -committer User 1427183369 +1300 -data 6 -empty - -blob -mark :2 -data 35 -We will reproduce a problem here. - -commit refs/heads/master -mark :3 -author User 1427183376 +1300 -committer User 1427183376 +1300 -data 11 -demo file. -from :1 -M 100644 :2 demo.txt - -blob -mark :4 -data 62 -We will reproduce a problem here. - -This will take some time. - -commit refs/heads/master -mark :5 -author User 1427185135 +1300 -committer User 1427185135 +1300 -data 13 -added a line -from :3 -M 100644 :4 demo.txt - -blob -mark :6 -data 57 -We will reproduce a problem here. - -We will change these. - -commit refs/heads/master -mark :7 -author User 1427185245 +1300 -committer User 1427185245 +1300 -data 14 -replace a line -from :5 -M 100644 :6 demo.txt - -blob -mark :8 -data 52 -We will change these. - -Then issues will be proven. - -commit refs/heads/master -mark :9 -author User 1427185343 +1300 -committer User 1427185343 +1300 -data 13 -Yes we will. -from :7 -M 100644 :8 demo.txt - -blob -mark :10 -data 69 -We will change these. - -Then issues will be proven once and for all. - -commit refs/heads/master -mark :11 -author User 1427185440 +1300 -committer User 1427185440 +1300 -data 6 -sure. -from :9 -M 100644 :10 demo.txt - -blob -mark :12 -data 0 - -commit refs/heads/master -mark :13 -author User 1427185512 +1300 -committer User 1427185516 +1300 -data 26 -not an actual readme, yet -from :11 -M 100644 :12 readme.txt - -blob -mark :14 -data 61 -This will for sure we will prove a problem exist somewhere. - -blob -mark :15 -data 49 -okay fine add something here this is only a test - -commit refs/heads/master -mark :16 -author User 1427185569 +1300 -committer User 1427185569 +1300 -data 12 -more things -from :13 -M 100644 :14 demo.txt -M 100644 :15 readme.txt - -blob -mark :17 -data 100 -This will for sure we will prove a problem exist somewhere. - -Just that we need a few more commits. - -commit refs/heads/master -mark :18 -author User 1427185659 +1300 -committer User 1427185659 +1300 -data 13 -one more try -from :16 -M 100644 :17 demo.txt - -blob -mark :19 -data 54 -It might have something to do with number of commits? - -commit refs/heads/master -mark :20 -author User 1427185905 +1300 -committer User 1427185905 +1300 -data 18 -is this number 9? -from :18 -M 100644 :19 commitcount - -blob -mark :21 -data 123 -This will for sure we will prove a problem exist somewhere. - -Just that we need a few more commits. - -Hey look we need more - -commit refs/heads/master -mark :22 -author User 1427185922 +1300 -committer User 1427185922 +1300 -data 5 -cool -from :20 -M 100644 :21 demo.txt - -blob -mark :23 -data 50 -Okay fine add something here this is only a test. - -commit refs/heads/master -mark :24 -author User 1427185936 +1300 -committer User 1427185936 +1300 -data 7 -readme -from :22 -M 100644 :23 readme.txt - -blob -mark :25 -data 74 -Okay come on this is getting boring. - -Yes I went and edit all the things. - -commit refs/heads/master -mark :26 -author User 1427185954 +1300 -committer User 1427185954 +1300 -data 14 -remove a line -from :24 -M 100644 :25 demo.txt - -blob -mark :27 -data 186 -Okay come on this is getting boring. - -Yes I went and edit all the things. - -Of course, making test data can be somewhat tedious, especially a -minimum set that can be easily reproduced. - -commit refs/heads/master -mark :28 -author User 1427185996 +1300 -committer User 1427185996 +1300 -data 25 -Getting serious mode on. -from :26 -M 100644 :27 demo.txt - -blob -mark :29 -data 48 -This is taking a bit longer than I remembered. - -commit refs/heads/master -mark :30 -author User 1427186065 +1300 -committer User 1427186065 +1300 -data 40 -At least we will have things minimized. -from :28 -M 100644 :29 demo.txt - -blob -mark :31 -data 11 -there yet? - -commit refs/heads/master -mark :32 -author User 1427186080 +1300 -committer User 1427186080 +1300 -data 7 -are we -from :30 -M 100644 :31 demo.txt - -blob -mark :33 -data 237 -This should be the head commit for the client repo for testing out -the failure case reported in issue 88. Just do a git pull from the -repo that includes the following commit that is hosted with dulwich. -The issue should be reproduced. - -commit refs/heads/master -mark :34 -author User 1427186109 +1300 -committer User 1427186109 +1300 -data 6 -okay? -from :32 -M 100644 :33 readme.txt blob - 6897693c08c6d44ed57dd8af26d9aeb45379679b (mode 644) blob + /dev/null --- dulwich/tests/data/repos/issue88_expect_ack_nak_other.export +++ /dev/null @@ -1,293 +0,0 @@ -blob -mark :1 -data 33 -We will sneak in a blob like so. - -reset refs/heads/master -commit refs/heads/master -mark :2 -author User 1427183369 +1300 -committer User 1427183369 +1300 -data 7 -sneaky -M 100644 :1 problem.questionmark - -blob -mark :3 -data 35 -We will introduce a problem here. - - -commit refs/heads/master -mark :4 -author User 1427183376 +1300 -committer User 1427183376 +1300 -data 11 -demo file. -from :2 -M 100644 :3 demo.rst - -blob -mark :5 -data 62 -We will introduce a problem here. - -This will take some time. - - -commit refs/heads/master -mark :6 -author User 1427185135 +1300 -committer User 1427185135 +1300 -data 13 -added a line -from :4 -M 100644 :5 demo.rst - -blob -mark :7 -data 57 -We will introduce a problem here. - -We will change these. - -commit refs/heads/master -mark :8 -author User 1427185245 +1300 -committer User 1427185245 +1300 -data 14 -replace a linefrom :6 -M 100644 :7 demo.rst - -blob -mark :9 -data 52 -We will change these. - -Then issues will be proven. - - -commit refs/heads/master -mark :10 -author User 1427185343 +1300 -committer User 1427185343 +1300 -data 13 -Yes we will. -from :8 -M 100644 :9 demo.rst - -blob -mark :11 -data 72 -We will change these. - -Then issues will be construed once and for all. - -commit refs/heads/master -mark :12 -author User 1427185440 +1300 -committer User 1427185440 +1300 -data 6 -sure. -from :10 -M 100644 :11 demo.rst - -blob -mark :13 -data 0 - -commit refs/heads/master -mark :14 -author User 1427185512 +1300 -committer User 1427185516 +1300 -data 26 -not an actual readme, yet -from :12 -M 100644 :13 emdaer.txt - -blob -mark :15 -data 58 -This will for sure we will prove issues exist somewhere. - - -blob -mark :16 -data 49 -okay fine add something here this is only a test - -commit refs/heads/master -mark :17 -author User 1427185569 +1300 -committer User 1427185569 +1300 -data 12 -more things -from :14 -M 100644 :15 demo.rst -M 100644 :16 emdaer.txt - -blob -mark :18 -data 97 -This will for sure prove issue exist somewhere. - -Just that we need a few more commits as usual. - - -commit refs/heads/master -mark :19 -author User 1427185659 +1300 -committer User 1427185659 +1300 -data 13 -one more try -from :17 -M 100644 :18 demo.rst - -blob -mark :20 -data 54 -It might have something to do with number of commits? - -commit refs/heads/master -mark :21 -author User 1427185905 +1300 -committer User 1427185905 +1300 -data 18 -is this number 9? -from :19 -M 100644 :20 count - -blob -mark :22 -data 119 -This will for sure we will prove issues exist somewhere. - -Just that we need a few more commits. - -Hey look we need more - -commit refs/heads/master -mark :23 -author User 1427185922 +1300 -committer User 1427185922 +1300 -data 5 -cool -from :21 -M 100644 :22 demo.rst - -blob -mark :24 -data 50 -Okay fine add something here this is only a test. - -commit refs/heads/master -mark :25 -author User 1427185936 +1300 -committer User 1427185936 +1300 -data 7 -readme -from :23 -M 100644 :24 emdaer.txt - -blob -mark :26 -data 74 -Okay come on this is getting boring. - -Yes I went and edit all the things. - -commit refs/heads/master -mark :27 -author User 1427185954 +1300 -committer User 1427185954 +1300 -data 14 -remove a line -from :25 -M 100644 :26 demo.rst - -blob -mark :28 -data 186 -Okay come on this is getting boring. - -Yes I went and edit all the things. - -Of course, making test data can be somewhat tedious, especially a -minimum set that can be easily reproduced. - -commit refs/heads/master -mark :29 -author User 1427185996 +1300 -committer User 1427185996 +1300 -data 25 -Getting serious mode on. -from :27 -M 100644 :28 demo.rst - -blob -mark :30 -data 48 -This is taking a bit longer than I remembered. - - -commit refs/heads/master -mark :31 -author User 1427186065 +1300 -committer User 1427186065 +1300 -data 40 -At least we will have things minimized. -from :29 -M 100644 :30 demo.rst - -blob -mark :32 -data 11 -there yet? - -commit refs/heads/master -mark :33 -author User 1427186080 +1300 -committer User 1427186080 +1300 -data 7 -are we -from :31 -M 100644 :32 demo.rst - -blob -mark :34 -data 237 -This should be the head commit for the client repo for testing out -the failure case reported in issue 88. Just do a git pull from the -repo that includes the following commit that is hosted with dulwich. -The issue should be reproduced. - - -commit refs/heads/master -mark :35 -author User 1427186109 +1300 -committer User 1427186109 +1300 -data 6 -okay? -from :33 -M 100644 :34 emdaer.txt - -blob -mark :36 -data 394 -This should be the commit that will trigger the bug noted in issue 88 -(https://github.com/jelmer/dulwich/issues/88). To reproduce, run git -fast-import using this fast-export and host this using dulwich, and -then make a copy of this, strip out this blob and the following commit -block, import to another git repo and then git clone from the previous. - -Naturally, this is part of the test case. - -commit refs/heads/master -mark :37 -author User 1427244891 +1300 -committer User 1427248186 +1300 -data 49 -Added instructions on how to use this to readme. -from :35 -M 100644 :36 emdaer.txt - blob - 0124fb32fe9d31db068b58fbaa68dbcf880fd3cb (mode 644) blob + /dev/null --- dulwich/tests/data/repos/issue88_expect_ack_nak_server.export +++ /dev/null @@ -1,281 +0,0 @@ -reset refs/heads/master -commit refs/heads/master -mark :1 -author User 1427183369 +1300 -committer User 1427183369 +1300 -data 6 -empty - -blob -mark :2 -data 35 -We will reproduce a problem here. - -commit refs/heads/master -mark :3 -author User 1427183376 +1300 -committer User 1427183376 +1300 -data 11 -demo file. -from :1 -M 100644 :2 demo.txt - -blob -mark :4 -data 62 -We will reproduce a problem here. - -This will take some time. - -commit refs/heads/master -mark :5 -author User 1427185135 +1300 -committer User 1427185135 +1300 -data 13 -added a line -from :3 -M 100644 :4 demo.txt - -blob -mark :6 -data 57 -We will reproduce a problem here. - -We will change these. - -commit refs/heads/master -mark :7 -author User 1427185245 +1300 -committer User 1427185245 +1300 -data 14 -replace a line -from :5 -M 100644 :6 demo.txt - -blob -mark :8 -data 52 -We will change these. - -Then issues will be proven. - -commit refs/heads/master -mark :9 -author User 1427185343 +1300 -committer User 1427185343 +1300 -data 13 -Yes we will. -from :7 -M 100644 :8 demo.txt - -blob -mark :10 -data 69 -We will change these. - -Then issues will be proven once and for all. - -commit refs/heads/master -mark :11 -author User 1427185440 +1300 -committer User 1427185440 +1300 -data 6 -sure. -from :9 -M 100644 :10 demo.txt - -blob -mark :12 -data 0 - -commit refs/heads/master -mark :13 -author User 1427185512 +1300 -committer User 1427185516 +1300 -data 26 -not an actual readme, yet -from :11 -M 100644 :12 readme.txt - -blob -mark :14 -data 61 -This will for sure we will prove a problem exist somewhere. - -blob -mark :15 -data 49 -okay fine add something here this is only a test - -commit refs/heads/master -mark :16 -author User 1427185569 +1300 -committer User 1427185569 +1300 -data 12 -more things -from :13 -M 100644 :14 demo.txt -M 100644 :15 readme.txt - -blob -mark :17 -data 100 -This will for sure we will prove a problem exist somewhere. - -Just that we need a few more commits. - -commit refs/heads/master -mark :18 -author User 1427185659 +1300 -committer User 1427185659 +1300 -data 13 -one more try -from :16 -M 100644 :17 demo.txt - -blob -mark :19 -data 54 -It might have something to do with number of commits? - -commit refs/heads/master -mark :20 -author User 1427185905 +1300 -committer User 1427185905 +1300 -data 18 -is this number 9? -from :18 -M 100644 :19 commitcount - -blob -mark :21 -data 123 -This will for sure we will prove a problem exist somewhere. - -Just that we need a few more commits. - -Hey look we need more - -commit refs/heads/master -mark :22 -author User 1427185922 +1300 -committer User 1427185922 +1300 -data 5 -cool -from :20 -M 100644 :21 demo.txt - -blob -mark :23 -data 50 -Okay fine add something here this is only a test. - -commit refs/heads/master -mark :24 -author User 1427185936 +1300 -committer User 1427185936 +1300 -data 7 -readme -from :22 -M 100644 :23 readme.txt - -blob -mark :25 -data 74 -Okay come on this is getting boring. - -Yes I went and edit all the things. - -commit refs/heads/master -mark :26 -author User 1427185954 +1300 -committer User 1427185954 +1300 -data 14 -remove a line -from :24 -M 100644 :25 demo.txt - -blob -mark :27 -data 186 -Okay come on this is getting boring. - -Yes I went and edit all the things. - -Of course, making test data can be somewhat tedious, especially a -minimum set that can be easily reproduced. - -commit refs/heads/master -mark :28 -author User 1427185996 +1300 -committer User 1427185996 +1300 -data 25 -Getting serious mode on. -from :26 -M 100644 :27 demo.txt - -blob -mark :29 -data 48 -This is taking a bit longer than I remembered. - -commit refs/heads/master -mark :30 -author User 1427186065 +1300 -committer User 1427186065 +1300 -data 40 -At least we will have things minimized. -from :28 -M 100644 :29 demo.txt - -blob -mark :31 -data 11 -there yet? - -commit refs/heads/master -mark :32 -author User 1427186080 +1300 -committer User 1427186080 +1300 -data 7 -are we -from :30 -M 100644 :31 demo.txt - -blob -mark :33 -data 237 -This should be the head commit for the client repo for testing out -the failure case reported in issue 88. Just do a git pull from the -repo that includes the following commit that is hosted with dulwich. -The issue should be reproduced. - -commit refs/heads/master -mark :34 -author User 1427186109 +1300 -committer User 1427186109 +1300 -data 6 -okay? -from :32 -M 100644 :33 readme.txt - -blob -mark :35 -data 394 -This should be the commit that will trigger the bug noted in issue 88 -(https://github.com/jelmer/dulwich/issues/88). To reproduce, run git -fast-import using this fast-export and host this using dulwich, and -then make a copy of this, strip out this blob and the following commit -block, import to another git repo and then git clone from the previous. - -Naturally, this is part of the test case. - -commit refs/heads/master -mark :36 -author User 1427244891 +1300 -committer User 1427248186 +1300 -data 49 -Added instructions on how to use this to readme. -from :34 -M 100644 :35 readme.txt - blob - cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) blob + /dev/null --- dulwich/tests/data/repos/ooo_merge.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master blob - cbe43c2ebd526cac5d66a4d0f614abf4d77c3e59 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b and /dev/null differ blob - 3f3699b36e39f0046a19227248c45215b0f5e452 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 and /dev/null differ blob - 95c3c19bbeaeda10c619530ac6ea902ae1c0cdd4 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 and /dev/null differ blob - 2569779c10cc06f9e3639d73183c80b6fbd8f243 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 and /dev/null differ blob - e88303b28d023fc86c939c7480d259df081ea402 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 +++ /dev/null @@ -1,3 +0,0 @@ -xAj1 E)L%[PJօ46Cf txӲzL -`MH* [dL:^ l8++Pb+46nhb&ei?:檵SH@mD -r_-ᗮxMY_~{a U*Z{2 -CW%>rT&I@$P5iX莥7y w:^o_|Q[IZS sVIEy? \ No newline at end of file blob - 5bda024ac879ef55da75751f82e4c7e9e417ad69 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 and /dev/null differ blob - 34c0a7949167c0d22872f6e5a5707a4cbe1621c4 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/ooo_merge.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -7601d7f6231db6a57f7bbb79ee52e4d462fd44d1 blob - cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master blob - 6160481e0d0f5c125699a9e97daba274708564ec (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 and /dev/null differ blob - 478d0379acec45352e22d368d2b6711b9285ef36 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 +++ /dev/null @@ -1,3 +0,0 @@ -x-Q -0D)-mV^i66.~{#Cm]rw yu=u5^[o<H<*y?ƴ,()a߈2<)$8xR.4YktPaԵ -q?W)'ǧ6 \ No newline at end of file blob - 1be455a300b50e3b834ff22744acb008d64ca20a (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec and /dev/null differ blob - 7e69c0efaf3324e3bde674e3bc90b4370466e315 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 and /dev/null differ blob - 777d49daa06e828ec64f48b9f3c14396d3fae3a5 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe +++ /dev/null @@ -1,6 +0,0 @@ -x-Q -0D)m7iV^i6bIEOo -~c`Av.; Zyku<*^Zox\T4 -< 4 .Lam -Fj#e /s=SRYBcQk -eZ-\r?)Y9 \ No newline at end of file blob - e40b2074233e9aef431a50bf761970cb7ccc50d9 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c and /dev/null differ blob - bf2f9e36e89d2085d2a1f03e477d1344b1be8a2f (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/packed-refs +++ /dev/null @@ -1,4 +0,0 @@ -# pack-refs with: peeled -df6800012397fb85c56e7418dd4eb9405dee075c refs/tags/refs-0.1 -^42d06bd4b77fed026b154d16493e5deab78f02ec -42d06bd4b77fed026b154d16493e5deab78f02ec refs/heads/packed blob - 2623a489ebb544326db1702067b25f08c63e517e (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa +++ /dev/null @@ -1 +0,0 @@ -42d06bd4b77fed026b154d16493e5deab78f02ec blob - ed2f1caab8d539a193a6167080d82e8ac540d2b4 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/refs/heads/loop +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/loop blob - 2623a489ebb544326db1702067b25f08c63e517e (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -42d06bd4b77fed026b154d16493e5deab78f02ec blob - 7ac75665748fe576c76fa53d29733f1f62ba2bd3 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/refs.git/refs/tags/refs-0.2 +++ /dev/null @@ -1 +0,0 @@ -3ec9c43c84ff242e3ef4a9fc5bc111fd780a76a8 blob - 25d48cae10efef0a108d2e255e836223bced827e (mode 644) blob + /dev/null --- dulwich/tests/data/repos/server_new.export +++ /dev/null @@ -1,99 +0,0 @@ -blob -mark :1 -data 13 -foo contents - -reset refs/heads/master -commit refs/heads/master -mark :2 -author Dave Borowitz 1265755064 -0800 -committer Dave Borowitz 1265755064 -0800 -data 16 -initial checkin -M 100644 :1 foo - -blob -mark :3 -data 13 -baz contents - -blob -mark :4 -data 21 -updated foo contents - -commit refs/heads/master -mark :5 -author Dave Borowitz 1265755140 -0800 -committer Dave Borowitz 1265755140 -0800 -data 15 -master checkin -from :2 -M 100644 :3 baz -M 100644 :4 foo - -blob -mark :6 -data 24 -updated foo contents v2 - -commit refs/heads/master -mark :7 -author Dave Borowitz 1265755287 -0800 -committer Dave Borowitz 1265755287 -0800 -data 17 -master checkin 2 -from :5 -M 100644 :6 foo - -blob -mark :8 -data 24 -updated foo contents v3 - -commit refs/heads/master -mark :9 -author Dave Borowitz 1265755295 -0800 -committer Dave Borowitz 1265755295 -0800 -data 17 -master checkin 3 -from :7 -M 100644 :8 foo - -blob -mark :10 -data 22 -branched bar contents - -blob -mark :11 -data 22 -branched foo contents - -commit refs/heads/branch -mark :12 -author Dave Borowitz 1265755111 -0800 -committer Dave Borowitz 1265755111 -0800 -data 15 -branch checkin -from :2 -M 100644 :10 bar -M 100644 :11 foo - -blob -mark :13 -data 25 -branched bar contents v2 - -commit refs/heads/branch -mark :14 -author Dave Borowitz 1265755319 -0800 -committer Dave Borowitz 1265755319 -0800 -data 17 -branch checkin 2 -from :12 -M 100644 :13 bar - -reset refs/heads/master -from :9 - blob - b02a3391baf0453d7341623ba62f814edb2769c7 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/server_old.export +++ /dev/null @@ -1,57 +0,0 @@ -blob -mark :1 -data 13 -foo contents - -reset refs/heads/master -commit refs/heads/master -mark :2 -author Dave Borowitz 1265755064 -0800 -committer Dave Borowitz 1265755064 -0800 -data 16 -initial checkin -M 100644 :1 foo - -blob -mark :3 -data 22 -branched bar contents - -blob -mark :4 -data 22 -branched foo contents - -commit refs/heads/branch -mark :5 -author Dave Borowitz 1265755111 -0800 -committer Dave Borowitz 1265755111 -0800 -data 15 -branch checkin -from :2 -M 100644 :3 bar -M 100644 :4 foo - -blob -mark :6 -data 13 -baz contents - -blob -mark :7 -data 21 -updated foo contents - -commit refs/heads/master -mark :8 -author Dave Borowitz 1265755140 -0800 -committer Dave Borowitz 1265755140 -0800 -data 15 -master checkin -from :2 -M 100644 :6 baz -M 100644 :7 foo - -reset refs/heads/master -from :8 - blob - cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) blob + /dev/null --- dulwich/tests/data/repos/simple_merge.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master blob - b4c3a1d99a4d24753afd83c3e179bd428b24764c (mode 644) blob + /dev/null --- dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 +++ /dev/null @@ -1,2 +0,0 @@ -xK -@])z53׮==-&e=i:"Z=H)r芔>4wYԯMx|q=s)&6Dh6{Ym/LXg? \ No newline at end of file blob - a2247b203f986dcb9c22184b1aae17353960c5b4 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 and /dev/null differ blob - 3dec0bf77a94a1664e95bd056f41ddb563072c89 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b and /dev/null differ blob - a73c46c7b6800a9df41452174604dcf600efd325 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 +++ /dev/null @@ -1,4 +0,0 @@ -xK -1D]L~=pݝŒ2Fo-U:.UUA I!KU.!kj -FN -*R{QofwSQ[!)G;]g8Шw863Mˇ/_m1 tSK0]i*'pCO \ No newline at end of file blob - 69c6dff1ab6b88df371b5f539df78e705d1f05a5 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc and /dev/null differ blob - 9e1d72632e9aa355b6f3efed9aa13f3a1259c426 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e +++ /dev/null @@ -1,4 +0,0 @@ -x -0E]+f/N"] g *5"O.υɗia UBERr[P\ʋ -Tz靖-zN0Q -)ZOEv,pIop['lǺ <|fֶk)PGX{&K0 ?yMQ \ No newline at end of file blob - 8f8ed37f1e6b8f0af781c26daa8f31ae9bd2167d (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 and /dev/null differ blob - 2569779c10cc06f9e3639d73183c80b6fbd8f243 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 and /dev/null differ blob - 610b7dfa3a19490625df89ba689ce6efe928d9eb (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 and /dev/null differ blob - 7bef12912d59b8fab01801f66978456947e6ce59 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 and /dev/null differ blob - 67706b5810550b826b747525ac1924499c87a6d2 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd +++ /dev/null @@ -1,2 +0,0 @@ -xM -0]$cL";/:3b mo|6=~SgU@c̍bUA)ƙ{ulR+ld&z7ږm{IiKt.pmQx?|ݨ!־c仴?s9r4/mO+ \ No newline at end of file blob - d45835e8201d096288a79b38053dbe259d5475b5 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 and /dev/null differ blob - dce887e80f980d37bb634a0e7c99c5e062292fbd (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 and /dev/null differ blob - 8c901c5b89f920a740af8b23b771ef4019cdb665 (mode 644) blob + /dev/null Binary files dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 and /dev/null differ blob - c6b8285fbdb5a417f490579d79252fc6d2d03c97 (mode 644) blob + /dev/null --- dulwich/tests/data/repos/simple_merge.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -5dac377bdded4c9aeb8dff595f0faeebcc8498cc blob - c493b47db9e7c5cf34da754182f3b099e44a64fc (mode 644) blob + /dev/null --- dulwich/tests/data/repos/submodule/dotgit +++ /dev/null @@ -1 +0,0 @@ -gitdir: ./a.git blob - 8c85e3a618f862f3df42941e44592d22f75f7695 (mode 644) blob + /dev/null --- dulwich/tests/data/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 +++ /dev/null @@ -1,5 +0,0 @@ -xmMO@=x#݅QnIMEQ -mʿG'sL2OSz,$1vqnaJb+0u3mMr -a dɢs,=RB bY(֝cQ Yjn!p 7# ݜ5!X[GپM} n}]8m9pzd% -!#f|X`fBKD%'sKCӝ5\4wYԯMx|q=s)&6Dh6{Ym/LXg? \ No newline at end of file blob - /dev/null blob + 69c6dff1ab6b88df371b5f539df78e705d1f05a5 (mode 644) Binary files /dev/null and testdata/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc differ blob - /dev/null blob + 9e1d72632e9aa355b6f3efed9aa13f3a1259c426 (mode 644) --- /dev/null +++ testdata/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e @@ -0,0 +1,4 @@ +x +0E]+f/N"] g *5"O.υɗia UBERr[P\ʋ +Tz靖-zN0Q +)ZOEv,pIop['lǺ <|fֶk)PGX{&K0 ?yMQ \ No newline at end of file blob - /dev/null blob + 96f9998c0a1883d2b96b5088650eec063a5d3e97 (mode 644) Binary files /dev/null and testdata/indexes/index differ blob - /dev/null blob + ca0454de928844663ddb20a0369f1d9af0391c72 (mode 644) Binary files /dev/null and testdata/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx differ blob - /dev/null blob + e2754b2777a048fd7e83b22d77a89462c2394d2f (mode 644) Binary files /dev/null and testdata/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack differ blob - /dev/null blob + 26cc331fb8748e2cf588db343a1c2f8242d4b692 (mode 644) --- /dev/null +++ testdata/repos/.gitattributes @@ -0,0 +1 @@ +*.export eol=lf blob - /dev/null blob + cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) --- /dev/null +++ testdata/repos/a.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master blob - /dev/null blob + f13a21bc5735e6b8bcf4423ce6645fcf32a1fafd (mode 644) --- /dev/null +++ testdata/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a @@ -0,0 +1,2 @@ +x5A +0a9\@i"" L1T"uPMA7o~2(0H\uB\]MNc+H!0&5Zi-)~ ߓ~ÏsP~Gl֮`јk N0 \ No newline at end of file blob - /dev/null blob + dfc9847b6f39818fb3a16abd03a52cca8b0488df (mode 644) Binary files /dev/null and testdata/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 differ blob - /dev/null blob + 00d4a694a367c8bef7c4fae99f1f18e6edfa1e53 (mode 644) Binary files /dev/null and testdata/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec differ blob - /dev/null blob + 522a3def4bbdd7178cd5f5758fd7f51831e394ea (mode 644) Binary files /dev/null and testdata/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 differ blob - /dev/null blob + 8a8432a9e223891b4250ec4ac8631b55b346017d (mode 644) Binary files /dev/null and testdata/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 differ blob - /dev/null blob + a044c5926c95969c522e5fabc37161ca65232d57 (mode 644) Binary files /dev/null and testdata/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 differ blob - /dev/null blob + 7d172f39d4e00239ca900fc7f1b94ee2f145db36 (mode 644) Binary files /dev/null and testdata/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 differ blob - /dev/null blob + e8b676a287932c6cce97f02dbf8ae805babc6f72 (mode 644) --- /dev/null +++ testdata/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 @@ -0,0 +1,3 @@ +x-[ +0**I75T[oRWo +w*`e/i7sjpیhjkL[c7L ><2ݏ 1Jr tqصh̰ɾ֥2v \ No newline at end of file blob - /dev/null blob + 81b997b636b0ddc243de5d5c11eb9e4a93450bf2 (mode 644) Binary files /dev/null and testdata/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f differ blob - /dev/null blob + daf2fc46e6e666c83d5da3aeb78a10abdcfd37b1 (mode 644) --- /dev/null +++ testdata/repos/a.git/packed-refs @@ -0,0 +1,3 @@ +# pack-refs with: peeled +b0931cadc54336e78a1d980420e3268903b57a50 refs/tags/mytag-packed +^2a72d929692c41d8554c07f6301757ba18a65d91 blob - /dev/null blob + e28347ea6dc57992bb974ef79daa09d8c760e075 (mode 644) --- /dev/null +++ testdata/repos/a.git/refs/heads/master @@ -0,0 +1 @@ +a90fa2d900a17e99b433217e988c4eb4a2e9a097 blob - /dev/null blob + cb5c1106d769d9358863fd29b0d869de55b9ce83 (mode 644) --- /dev/null +++ testdata/repos/a.git/refs/tags/mytag @@ -0,0 +1 @@ +28237f4dc30d0d462658d6b937b08a0f0b6ef55a blob - /dev/null blob + cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) --- /dev/null +++ testdata/repos/empty.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master blob - /dev/null blob + 90e16477bddfa48ec34154f9d7211aac4e32a511 (mode 644) --- /dev/null +++ testdata/repos/empty.git/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = true + symlinks = false + ignorecase = true + hideDotFiles = dotGitOnly blob - /dev/null blob + c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) --- /dev/null +++ testdata/repos/empty.git/objects/info/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file blob - /dev/null blob + c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) --- /dev/null +++ testdata/repos/empty.git/objects/pack/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file blob - /dev/null blob + c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) --- /dev/null +++ testdata/repos/empty.git/refs/heads/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file blob - /dev/null blob + c96a04f008ee21e260b28f7701595ed59e2839e3 (mode 644) --- /dev/null +++ testdata/repos/empty.git/refs/tags/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file blob - /dev/null blob + 48bdc140b6ec1a433f0d765bbb5affb6fd0200a3 (mode 644) --- /dev/null +++ testdata/repos/issue88_expect_ack_nak_client.export @@ -0,0 +1,260 @@ +reset refs/heads/master +commit refs/heads/master +mark :1 +author User 1427183369 +1300 +committer User 1427183369 +1300 +data 6 +empty + +blob +mark :2 +data 35 +We will reproduce a problem here. + +commit refs/heads/master +mark :3 +author User 1427183376 +1300 +committer User 1427183376 +1300 +data 11 +demo file. +from :1 +M 100644 :2 demo.txt + +blob +mark :4 +data 62 +We will reproduce a problem here. + +This will take some time. + +commit refs/heads/master +mark :5 +author User 1427185135 +1300 +committer User 1427185135 +1300 +data 13 +added a line +from :3 +M 100644 :4 demo.txt + +blob +mark :6 +data 57 +We will reproduce a problem here. + +We will change these. + +commit refs/heads/master +mark :7 +author User 1427185245 +1300 +committer User 1427185245 +1300 +data 14 +replace a line +from :5 +M 100644 :6 demo.txt + +blob +mark :8 +data 52 +We will change these. + +Then issues will be proven. + +commit refs/heads/master +mark :9 +author User 1427185343 +1300 +committer User 1427185343 +1300 +data 13 +Yes we will. +from :7 +M 100644 :8 demo.txt + +blob +mark :10 +data 69 +We will change these. + +Then issues will be proven once and for all. + +commit refs/heads/master +mark :11 +author User 1427185440 +1300 +committer User 1427185440 +1300 +data 6 +sure. +from :9 +M 100644 :10 demo.txt + +blob +mark :12 +data 0 + +commit refs/heads/master +mark :13 +author User 1427185512 +1300 +committer User 1427185516 +1300 +data 26 +not an actual readme, yet +from :11 +M 100644 :12 readme.txt + +blob +mark :14 +data 61 +This will for sure we will prove a problem exist somewhere. + +blob +mark :15 +data 49 +okay fine add something here this is only a test + +commit refs/heads/master +mark :16 +author User 1427185569 +1300 +committer User 1427185569 +1300 +data 12 +more things +from :13 +M 100644 :14 demo.txt +M 100644 :15 readme.txt + +blob +mark :17 +data 100 +This will for sure we will prove a problem exist somewhere. + +Just that we need a few more commits. + +commit refs/heads/master +mark :18 +author User 1427185659 +1300 +committer User 1427185659 +1300 +data 13 +one more try +from :16 +M 100644 :17 demo.txt + +blob +mark :19 +data 54 +It might have something to do with number of commits? + +commit refs/heads/master +mark :20 +author User 1427185905 +1300 +committer User 1427185905 +1300 +data 18 +is this number 9? +from :18 +M 100644 :19 commitcount + +blob +mark :21 +data 123 +This will for sure we will prove a problem exist somewhere. + +Just that we need a few more commits. + +Hey look we need more + +commit refs/heads/master +mark :22 +author User 1427185922 +1300 +committer User 1427185922 +1300 +data 5 +cool +from :20 +M 100644 :21 demo.txt + +blob +mark :23 +data 50 +Okay fine add something here this is only a test. + +commit refs/heads/master +mark :24 +author User 1427185936 +1300 +committer User 1427185936 +1300 +data 7 +readme +from :22 +M 100644 :23 readme.txt + +blob +mark :25 +data 74 +Okay come on this is getting boring. + +Yes I went and edit all the things. + +commit refs/heads/master +mark :26 +author User 1427185954 +1300 +committer User 1427185954 +1300 +data 14 +remove a line +from :24 +M 100644 :25 demo.txt + +blob +mark :27 +data 186 +Okay come on this is getting boring. + +Yes I went and edit all the things. + +Of course, making test data can be somewhat tedious, especially a +minimum set that can be easily reproduced. + +commit refs/heads/master +mark :28 +author User 1427185996 +1300 +committer User 1427185996 +1300 +data 25 +Getting serious mode on. +from :26 +M 100644 :27 demo.txt + +blob +mark :29 +data 48 +This is taking a bit longer than I remembered. + +commit refs/heads/master +mark :30 +author User 1427186065 +1300 +committer User 1427186065 +1300 +data 40 +At least we will have things minimized. +from :28 +M 100644 :29 demo.txt + +blob +mark :31 +data 11 +there yet? + +commit refs/heads/master +mark :32 +author User 1427186080 +1300 +committer User 1427186080 +1300 +data 7 +are we +from :30 +M 100644 :31 demo.txt + +blob +mark :33 +data 237 +This should be the head commit for the client repo for testing out +the failure case reported in issue 88. Just do a git pull from the +repo that includes the following commit that is hosted with dulwich. +The issue should be reproduced. + +commit refs/heads/master +mark :34 +author User 1427186109 +1300 +committer User 1427186109 +1300 +data 6 +okay? +from :32 +M 100644 :33 readme.txt blob - /dev/null blob + 6897693c08c6d44ed57dd8af26d9aeb45379679b (mode 644) --- /dev/null +++ testdata/repos/issue88_expect_ack_nak_other.export @@ -0,0 +1,293 @@ +blob +mark :1 +data 33 +We will sneak in a blob like so. + +reset refs/heads/master +commit refs/heads/master +mark :2 +author User 1427183369 +1300 +committer User 1427183369 +1300 +data 7 +sneaky +M 100644 :1 problem.questionmark + +blob +mark :3 +data 35 +We will introduce a problem here. + + +commit refs/heads/master +mark :4 +author User 1427183376 +1300 +committer User 1427183376 +1300 +data 11 +demo file. +from :2 +M 100644 :3 demo.rst + +blob +mark :5 +data 62 +We will introduce a problem here. + +This will take some time. + + +commit refs/heads/master +mark :6 +author User 1427185135 +1300 +committer User 1427185135 +1300 +data 13 +added a line +from :4 +M 100644 :5 demo.rst + +blob +mark :7 +data 57 +We will introduce a problem here. + +We will change these. + +commit refs/heads/master +mark :8 +author User 1427185245 +1300 +committer User 1427185245 +1300 +data 14 +replace a linefrom :6 +M 100644 :7 demo.rst + +blob +mark :9 +data 52 +We will change these. + +Then issues will be proven. + + +commit refs/heads/master +mark :10 +author User 1427185343 +1300 +committer User 1427185343 +1300 +data 13 +Yes we will. +from :8 +M 100644 :9 demo.rst + +blob +mark :11 +data 72 +We will change these. + +Then issues will be construed once and for all. + +commit refs/heads/master +mark :12 +author User 1427185440 +1300 +committer User 1427185440 +1300 +data 6 +sure. +from :10 +M 100644 :11 demo.rst + +blob +mark :13 +data 0 + +commit refs/heads/master +mark :14 +author User 1427185512 +1300 +committer User 1427185516 +1300 +data 26 +not an actual readme, yet +from :12 +M 100644 :13 emdaer.txt + +blob +mark :15 +data 58 +This will for sure we will prove issues exist somewhere. + + +blob +mark :16 +data 49 +okay fine add something here this is only a test + +commit refs/heads/master +mark :17 +author User 1427185569 +1300 +committer User 1427185569 +1300 +data 12 +more things +from :14 +M 100644 :15 demo.rst +M 100644 :16 emdaer.txt + +blob +mark :18 +data 97 +This will for sure prove issue exist somewhere. + +Just that we need a few more commits as usual. + + +commit refs/heads/master +mark :19 +author User 1427185659 +1300 +committer User 1427185659 +1300 +data 13 +one more try +from :17 +M 100644 :18 demo.rst + +blob +mark :20 +data 54 +It might have something to do with number of commits? + +commit refs/heads/master +mark :21 +author User 1427185905 +1300 +committer User 1427185905 +1300 +data 18 +is this number 9? +from :19 +M 100644 :20 count + +blob +mark :22 +data 119 +This will for sure we will prove issues exist somewhere. + +Just that we need a few more commits. + +Hey look we need more + +commit refs/heads/master +mark :23 +author User 1427185922 +1300 +committer User 1427185922 +1300 +data 5 +cool +from :21 +M 100644 :22 demo.rst + +blob +mark :24 +data 50 +Okay fine add something here this is only a test. + +commit refs/heads/master +mark :25 +author User 1427185936 +1300 +committer User 1427185936 +1300 +data 7 +readme +from :23 +M 100644 :24 emdaer.txt + +blob +mark :26 +data 74 +Okay come on this is getting boring. + +Yes I went and edit all the things. + +commit refs/heads/master +mark :27 +author User 1427185954 +1300 +committer User 1427185954 +1300 +data 14 +remove a line +from :25 +M 100644 :26 demo.rst + +blob +mark :28 +data 186 +Okay come on this is getting boring. + +Yes I went and edit all the things. + +Of course, making test data can be somewhat tedious, especially a +minimum set that can be easily reproduced. + +commit refs/heads/master +mark :29 +author User 1427185996 +1300 +committer User 1427185996 +1300 +data 25 +Getting serious mode on. +from :27 +M 100644 :28 demo.rst + +blob +mark :30 +data 48 +This is taking a bit longer than I remembered. + + +commit refs/heads/master +mark :31 +author User 1427186065 +1300 +committer User 1427186065 +1300 +data 40 +At least we will have things minimized. +from :29 +M 100644 :30 demo.rst + +blob +mark :32 +data 11 +there yet? + +commit refs/heads/master +mark :33 +author User 1427186080 +1300 +committer User 1427186080 +1300 +data 7 +are we +from :31 +M 100644 :32 demo.rst + +blob +mark :34 +data 237 +This should be the head commit for the client repo for testing out +the failure case reported in issue 88. Just do a git pull from the +repo that includes the following commit that is hosted with dulwich. +The issue should be reproduced. + + +commit refs/heads/master +mark :35 +author User 1427186109 +1300 +committer User 1427186109 +1300 +data 6 +okay? +from :33 +M 100644 :34 emdaer.txt + +blob +mark :36 +data 394 +This should be the commit that will trigger the bug noted in issue 88 +(https://github.com/jelmer/dulwich/issues/88). To reproduce, run git +fast-import using this fast-export and host this using dulwich, and +then make a copy of this, strip out this blob and the following commit +block, import to another git repo and then git clone from the previous. + +Naturally, this is part of the test case. + +commit refs/heads/master +mark :37 +author User 1427244891 +1300 +committer User 1427248186 +1300 +data 49 +Added instructions on how to use this to readme. +from :35 +M 100644 :36 emdaer.txt + blob - /dev/null blob + 0124fb32fe9d31db068b58fbaa68dbcf880fd3cb (mode 644) --- /dev/null +++ testdata/repos/issue88_expect_ack_nak_server.export @@ -0,0 +1,281 @@ +reset refs/heads/master +commit refs/heads/master +mark :1 +author User 1427183369 +1300 +committer User 1427183369 +1300 +data 6 +empty + +blob +mark :2 +data 35 +We will reproduce a problem here. + +commit refs/heads/master +mark :3 +author User 1427183376 +1300 +committer User 1427183376 +1300 +data 11 +demo file. +from :1 +M 100644 :2 demo.txt + +blob +mark :4 +data 62 +We will reproduce a problem here. + +This will take some time. + +commit refs/heads/master +mark :5 +author User 1427185135 +1300 +committer User 1427185135 +1300 +data 13 +added a line +from :3 +M 100644 :4 demo.txt + +blob +mark :6 +data 57 +We will reproduce a problem here. + +We will change these. + +commit refs/heads/master +mark :7 +author User 1427185245 +1300 +committer User 1427185245 +1300 +data 14 +replace a line +from :5 +M 100644 :6 demo.txt + +blob +mark :8 +data 52 +We will change these. + +Then issues will be proven. + +commit refs/heads/master +mark :9 +author User 1427185343 +1300 +committer User 1427185343 +1300 +data 13 +Yes we will. +from :7 +M 100644 :8 demo.txt + +blob +mark :10 +data 69 +We will change these. + +Then issues will be proven once and for all. + +commit refs/heads/master +mark :11 +author User 1427185440 +1300 +committer User 1427185440 +1300 +data 6 +sure. +from :9 +M 100644 :10 demo.txt + +blob +mark :12 +data 0 + +commit refs/heads/master +mark :13 +author User 1427185512 +1300 +committer User 1427185516 +1300 +data 26 +not an actual readme, yet +from :11 +M 100644 :12 readme.txt + +blob +mark :14 +data 61 +This will for sure we will prove a problem exist somewhere. + +blob +mark :15 +data 49 +okay fine add something here this is only a test + +commit refs/heads/master +mark :16 +author User 1427185569 +1300 +committer User 1427185569 +1300 +data 12 +more things +from :13 +M 100644 :14 demo.txt +M 100644 :15 readme.txt + +blob +mark :17 +data 100 +This will for sure we will prove a problem exist somewhere. + +Just that we need a few more commits. + +commit refs/heads/master +mark :18 +author User 1427185659 +1300 +committer User 1427185659 +1300 +data 13 +one more try +from :16 +M 100644 :17 demo.txt + +blob +mark :19 +data 54 +It might have something to do with number of commits? + +commit refs/heads/master +mark :20 +author User 1427185905 +1300 +committer User 1427185905 +1300 +data 18 +is this number 9? +from :18 +M 100644 :19 commitcount + +blob +mark :21 +data 123 +This will for sure we will prove a problem exist somewhere. + +Just that we need a few more commits. + +Hey look we need more + +commit refs/heads/master +mark :22 +author User 1427185922 +1300 +committer User 1427185922 +1300 +data 5 +cool +from :20 +M 100644 :21 demo.txt + +blob +mark :23 +data 50 +Okay fine add something here this is only a test. + +commit refs/heads/master +mark :24 +author User 1427185936 +1300 +committer User 1427185936 +1300 +data 7 +readme +from :22 +M 100644 :23 readme.txt + +blob +mark :25 +data 74 +Okay come on this is getting boring. + +Yes I went and edit all the things. + +commit refs/heads/master +mark :26 +author User 1427185954 +1300 +committer User 1427185954 +1300 +data 14 +remove a line +from :24 +M 100644 :25 demo.txt + +blob +mark :27 +data 186 +Okay come on this is getting boring. + +Yes I went and edit all the things. + +Of course, making test data can be somewhat tedious, especially a +minimum set that can be easily reproduced. + +commit refs/heads/master +mark :28 +author User 1427185996 +1300 +committer User 1427185996 +1300 +data 25 +Getting serious mode on. +from :26 +M 100644 :27 demo.txt + +blob +mark :29 +data 48 +This is taking a bit longer than I remembered. + +commit refs/heads/master +mark :30 +author User 1427186065 +1300 +committer User 1427186065 +1300 +data 40 +At least we will have things minimized. +from :28 +M 100644 :29 demo.txt + +blob +mark :31 +data 11 +there yet? + +commit refs/heads/master +mark :32 +author User 1427186080 +1300 +committer User 1427186080 +1300 +data 7 +are we +from :30 +M 100644 :31 demo.txt + +blob +mark :33 +data 237 +This should be the head commit for the client repo for testing out +the failure case reported in issue 88. Just do a git pull from the +repo that includes the following commit that is hosted with dulwich. +The issue should be reproduced. + +commit refs/heads/master +mark :34 +author User 1427186109 +1300 +committer User 1427186109 +1300 +data 6 +okay? +from :32 +M 100644 :33 readme.txt + +blob +mark :35 +data 394 +This should be the commit that will trigger the bug noted in issue 88 +(https://github.com/jelmer/dulwich/issues/88). To reproduce, run git +fast-import using this fast-export and host this using dulwich, and +then make a copy of this, strip out this blob and the following commit +block, import to another git repo and then git clone from the previous. + +Naturally, this is part of the test case. + +commit refs/heads/master +mark :36 +author User 1427244891 +1300 +committer User 1427248186 +1300 +data 49 +Added instructions on how to use this to readme. +from :34 +M 100644 :35 readme.txt + blob - /dev/null blob + cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) --- /dev/null +++ testdata/repos/ooo_merge.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master blob - /dev/null blob + cbe43c2ebd526cac5d66a4d0f614abf4d77c3e59 (mode 644) Binary files /dev/null and testdata/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b differ blob - /dev/null blob + 3f3699b36e39f0046a19227248c45215b0f5e452 (mode 644) Binary files /dev/null and testdata/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 differ blob - /dev/null blob + 95c3c19bbeaeda10c619530ac6ea902ae1c0cdd4 (mode 644) Binary files /dev/null and testdata/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 differ blob - /dev/null blob + 2569779c10cc06f9e3639d73183c80b6fbd8f243 (mode 644) Binary files /dev/null and testdata/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 differ blob - /dev/null blob + e88303b28d023fc86c939c7480d259df081ea402 (mode 644) --- /dev/null +++ testdata/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 @@ -0,0 +1,3 @@ +xAj1 E)L%[PJօ46Cf txӲzL +`MH* [dL:^ l8++Pb+46nhb&ei?:檵SH@mD +r_-ᗮxMY_~{a U*Z{2 +CW%>rT&I@$P5iX莥7y w:^o_|Q[IZS sVIEy? \ No newline at end of file blob - /dev/null blob + 5bda024ac879ef55da75751f82e4c7e9e417ad69 (mode 644) Binary files /dev/null and testdata/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 differ blob - /dev/null blob + 34c0a7949167c0d22872f6e5a5707a4cbe1621c4 (mode 644) --- /dev/null +++ testdata/repos/ooo_merge.git/refs/heads/master @@ -0,0 +1 @@ +7601d7f6231db6a57f7bbb79ee52e4d462fd44d1 blob - /dev/null blob + cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) --- /dev/null +++ testdata/repos/refs.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master blob - /dev/null blob + 6160481e0d0f5c125699a9e97daba274708564ec (mode 644) Binary files /dev/null and testdata/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 differ blob - /dev/null blob + 478d0379acec45352e22d368d2b6711b9285ef36 (mode 644) --- /dev/null +++ testdata/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 @@ -0,0 +1,3 @@ +x-Q +0D)-mV^i66.~{#Cm]rw yu=u5^[o<H<*y?ƴ,()a߈2<)$8xR.4YktPaԵ +q?W)'ǧ6 \ No newline at end of file blob - /dev/null blob + 1be455a300b50e3b834ff22744acb008d64ca20a (mode 644) Binary files /dev/null and testdata/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec differ blob - /dev/null blob + 7e69c0efaf3324e3bde674e3bc90b4370466e315 (mode 644) Binary files /dev/null and testdata/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 differ blob - /dev/null blob + 777d49daa06e828ec64f48b9f3c14396d3fae3a5 (mode 644) --- /dev/null +++ testdata/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe @@ -0,0 +1,6 @@ +x-Q +0D)m7iV^i6bIEOo +~c`Av.; Zyku<*^Zox\T4 +< 4 .Lam +Fj#e /s=SRYBcQk +eZ-\r?)Y9 \ No newline at end of file blob - /dev/null blob + e40b2074233e9aef431a50bf761970cb7ccc50d9 (mode 644) Binary files /dev/null and testdata/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c differ blob - /dev/null blob + bf2f9e36e89d2085d2a1f03e477d1344b1be8a2f (mode 644) --- /dev/null +++ testdata/repos/refs.git/packed-refs @@ -0,0 +1,4 @@ +# pack-refs with: peeled +df6800012397fb85c56e7418dd4eb9405dee075c refs/tags/refs-0.1 +^42d06bd4b77fed026b154d16493e5deab78f02ec +42d06bd4b77fed026b154d16493e5deab78f02ec refs/heads/packed blob - /dev/null blob + 2623a489ebb544326db1702067b25f08c63e517e (mode 644) --- /dev/null +++ testdata/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa @@ -0,0 +1 @@ +42d06bd4b77fed026b154d16493e5deab78f02ec blob - /dev/null blob + ed2f1caab8d539a193a6167080d82e8ac540d2b4 (mode 644) --- /dev/null +++ testdata/repos/refs.git/refs/heads/loop @@ -0,0 +1 @@ +ref: refs/heads/loop blob - /dev/null blob + 2623a489ebb544326db1702067b25f08c63e517e (mode 644) --- /dev/null +++ testdata/repos/refs.git/refs/heads/master @@ -0,0 +1 @@ +42d06bd4b77fed026b154d16493e5deab78f02ec blob - /dev/null blob + 7ac75665748fe576c76fa53d29733f1f62ba2bd3 (mode 644) --- /dev/null +++ testdata/repos/refs.git/refs/tags/refs-0.2 @@ -0,0 +1 @@ +3ec9c43c84ff242e3ef4a9fc5bc111fd780a76a8 blob - /dev/null blob + 25d48cae10efef0a108d2e255e836223bced827e (mode 644) --- /dev/null +++ testdata/repos/server_new.export @@ -0,0 +1,99 @@ +blob +mark :1 +data 13 +foo contents + +reset refs/heads/master +commit refs/heads/master +mark :2 +author Dave Borowitz 1265755064 -0800 +committer Dave Borowitz 1265755064 -0800 +data 16 +initial checkin +M 100644 :1 foo + +blob +mark :3 +data 13 +baz contents + +blob +mark :4 +data 21 +updated foo contents + +commit refs/heads/master +mark :5 +author Dave Borowitz 1265755140 -0800 +committer Dave Borowitz 1265755140 -0800 +data 15 +master checkin +from :2 +M 100644 :3 baz +M 100644 :4 foo + +blob +mark :6 +data 24 +updated foo contents v2 + +commit refs/heads/master +mark :7 +author Dave Borowitz 1265755287 -0800 +committer Dave Borowitz 1265755287 -0800 +data 17 +master checkin 2 +from :5 +M 100644 :6 foo + +blob +mark :8 +data 24 +updated foo contents v3 + +commit refs/heads/master +mark :9 +author Dave Borowitz 1265755295 -0800 +committer Dave Borowitz 1265755295 -0800 +data 17 +master checkin 3 +from :7 +M 100644 :8 foo + +blob +mark :10 +data 22 +branched bar contents + +blob +mark :11 +data 22 +branched foo contents + +commit refs/heads/branch +mark :12 +author Dave Borowitz 1265755111 -0800 +committer Dave Borowitz 1265755111 -0800 +data 15 +branch checkin +from :2 +M 100644 :10 bar +M 100644 :11 foo + +blob +mark :13 +data 25 +branched bar contents v2 + +commit refs/heads/branch +mark :14 +author Dave Borowitz 1265755319 -0800 +committer Dave Borowitz 1265755319 -0800 +data 17 +branch checkin 2 +from :12 +M 100644 :13 bar + +reset refs/heads/master +from :9 + blob - /dev/null blob + b02a3391baf0453d7341623ba62f814edb2769c7 (mode 644) --- /dev/null +++ testdata/repos/server_old.export @@ -0,0 +1,57 @@ +blob +mark :1 +data 13 +foo contents + +reset refs/heads/master +commit refs/heads/master +mark :2 +author Dave Borowitz 1265755064 -0800 +committer Dave Borowitz 1265755064 -0800 +data 16 +initial checkin +M 100644 :1 foo + +blob +mark :3 +data 22 +branched bar contents + +blob +mark :4 +data 22 +branched foo contents + +commit refs/heads/branch +mark :5 +author Dave Borowitz 1265755111 -0800 +committer Dave Borowitz 1265755111 -0800 +data 15 +branch checkin +from :2 +M 100644 :3 bar +M 100644 :4 foo + +blob +mark :6 +data 13 +baz contents + +blob +mark :7 +data 21 +updated foo contents + +commit refs/heads/master +mark :8 +author Dave Borowitz 1265755140 -0800 +committer Dave Borowitz 1265755140 -0800 +data 15 +master checkin +from :2 +M 100644 :6 baz +M 100644 :7 foo + +reset refs/heads/master +from :8 + blob - /dev/null blob + cb089cd89a7d7686d284d8761201649346b5aa1c (mode 644) --- /dev/null +++ testdata/repos/simple_merge.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master blob - /dev/null blob + b4c3a1d99a4d24753afd83c3e179bd428b24764c (mode 644) --- /dev/null +++ testdata/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 @@ -0,0 +1,2 @@ +xK +@])z53׮==-&e=i:"Z=H)r芔>4wYԯMx|q=s)&6Dh6{Ym/LXg? \ No newline at end of file blob - /dev/null blob + a2247b203f986dcb9c22184b1aae17353960c5b4 (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 differ blob - /dev/null blob + 3dec0bf77a94a1664e95bd056f41ddb563072c89 (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b differ blob - /dev/null blob + a73c46c7b6800a9df41452174604dcf600efd325 (mode 644) --- /dev/null +++ testdata/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 @@ -0,0 +1,4 @@ +xK +1D]L~=pݝŒ2Fo-U:.UUA I!KU.!kj +FN +*R{QofwSQ[!)G;]g8Шw863Mˇ/_m1 tSK0]i*'pCO \ No newline at end of file blob - /dev/null blob + 69c6dff1ab6b88df371b5f539df78e705d1f05a5 (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc differ blob - /dev/null blob + 9e1d72632e9aa355b6f3efed9aa13f3a1259c426 (mode 644) --- /dev/null +++ testdata/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e @@ -0,0 +1,4 @@ +x +0E]+f/N"] g *5"O.υɗia UBERr[P\ʋ +Tz靖-zN0Q +)ZOEv,pIop['lǺ <|fֶk)PGX{&K0 ?yMQ \ No newline at end of file blob - /dev/null blob + 8f8ed37f1e6b8f0af781c26daa8f31ae9bd2167d (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 differ blob - /dev/null blob + 2569779c10cc06f9e3639d73183c80b6fbd8f243 (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 differ blob - /dev/null blob + 610b7dfa3a19490625df89ba689ce6efe928d9eb (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 differ blob - /dev/null blob + 7bef12912d59b8fab01801f66978456947e6ce59 (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 differ blob - /dev/null blob + 67706b5810550b826b747525ac1924499c87a6d2 (mode 644) --- /dev/null +++ testdata/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd @@ -0,0 +1,2 @@ +xM +0]$cL";/:3b mo|6=~SgU@c̍bUA)ƙ{ulR+ld&z7ږm{IiKt.pmQx?|ݨ!־c仴?s9r4/mO+ \ No newline at end of file blob - /dev/null blob + d45835e8201d096288a79b38053dbe259d5475b5 (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 differ blob - /dev/null blob + dce887e80f980d37bb634a0e7c99c5e062292fbd (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 differ blob - /dev/null blob + 8c901c5b89f920a740af8b23b771ef4019cdb665 (mode 644) Binary files /dev/null and testdata/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 differ blob - /dev/null blob + c6b8285fbdb5a417f490579d79252fc6d2d03c97 (mode 644) --- /dev/null +++ testdata/repos/simple_merge.git/refs/heads/master @@ -0,0 +1 @@ +5dac377bdded4c9aeb8dff595f0faeebcc8498cc blob - /dev/null blob + c493b47db9e7c5cf34da754182f3b099e44a64fc (mode 644) --- /dev/null +++ testdata/repos/submodule/dotgit @@ -0,0 +1 @@ +gitdir: ./a.git blob - /dev/null blob + 8c85e3a618f862f3df42941e44592d22f75f7695 (mode 644) --- /dev/null +++ testdata/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 @@ -0,0 +1,5 @@ +xmMO@=x#݅QnIMEQ +mʿG'sL2OSz,$1vqnaJb+0u3mMr +a dɢs,=RB bY(֝cQ Yjn!p 7# ݜ5!X[GپM} n}]8m9pzd% +!#f|X`fBKD%'sKCӝ5\