From 8ae8e4c9cbf8815ee899b671c5df395431436f4b Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 16 May 2015 03:28:41 -0500 Subject: [PATCH 1/8] Show diff for test resource text artifacts --- LibGit2Sharp.Tests/Resources/.gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LibGit2Sharp.Tests/Resources/.gitattributes b/LibGit2Sharp.Tests/Resources/.gitattributes index 23d9bdb29..48eb3141c 100644 --- a/LibGit2Sharp.Tests/Resources/.gitattributes +++ b/LibGit2Sharp.Tests/Resources/.gitattributes @@ -1 +1,4 @@ * binary +.gitattributes diff +.gitignore diff +config diff From 3f1bedabd320bfde2c6acb5cd28499756c03c75d Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 16 May 2015 02:55:49 -0500 Subject: [PATCH 2/8] Fix submodule_wd submodule remote URLs --- .../submodule_wd/dot_git/modules/sm_added_and_uncommited/config | 2 +- .../submodule_wd/dot_git/modules/sm_changed_file/config | 2 +- .../submodule_wd/dot_git/modules/sm_changed_head/config | 2 +- .../submodule_wd/dot_git/modules/sm_changed_index/config | 2 +- .../dot_git/modules/sm_changed_untracked_file/config | 2 +- .../submodule_wd/dot_git/modules/sm_missing_commits/config | 2 +- .../Resources/submodule_wd/dot_git/modules/sm_unchanged/config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/config index 2d0583e99..e37936d26 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/config @@ -7,7 +7,7 @@ ignorecase = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target + url = ../../../../submodule_target_wd [branch "master"] remote = origin merge = refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/config index 10cc2508e..9812c64b3 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/config @@ -7,7 +7,7 @@ ignorecase = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target + url = ../../../../submodule_target_wd [branch "master"] remote = origin merge = refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/config index 7d002536a..6d46e37ac 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/config @@ -7,7 +7,7 @@ ignorecase = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target + url = ../../../../submodule_target_wd [branch "master"] remote = origin merge = refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/config index 0274ff7e3..94490e330 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/config @@ -7,7 +7,7 @@ ignorecase = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target + url = ../../../../submodule_target_wd [branch "master"] remote = origin merge = refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/config index 7f2584476..e5ff0780a 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/config @@ -7,7 +7,7 @@ ignorecase = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target + url = ../../../../submodule_target_wd [branch "master"] remote = origin merge = refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/config index 45fbb30cf..376a475b5 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/config @@ -7,7 +7,7 @@ ignorecase = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target + url = ../../../../submodule_target_wd [branch "master"] remote = origin merge = refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/config index fc706c9dd..ea79f0e26 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/config @@ -7,7 +7,7 @@ ignorecase = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target + url = ../../../../submodule_target_wd [branch "master"] remote = origin merge = refs/heads/master From 3feeb01afd072bef4edd6e5e735d35c23505f516 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Fri, 10 Jan 2014 22:53:48 -0600 Subject: [PATCH 3/8] Add sm_branch_only in a dev branch --- .../13/921096a46cb66610badba272f8211346eaf8f3 | Bin 0 -> 172 bytes .../6b/94d06e586d4ed904d8c00a9de7d0afe0fc9c3c | Bin 0 -> 167 bytes .../87/aa3a079302a662a9226af3c6e7f444815e3faf | Bin 0 -> 261 bytes .../a4/aab482be687d2facec638781ded4aa1a92687a | Bin 0 -> 189 bytes .../cf/27c0500009f6d12fd82d841ecf6a17b18ff812 | 2 ++ .../Resources/submodule_wd/dot_git/refs/heads/dev | 1 + 6 files changed, 3 insertions(+) create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/13/921096a46cb66610badba272f8211346eaf8f3 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/6b/94d06e586d4ed904d8c00a9de7d0afe0fc9c3c create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/87/aa3a079302a662a9226af3c6e7f444815e3faf create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/a4/aab482be687d2facec638781ded4aa1a92687a create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/cf/27c0500009f6d12fd82d841ecf6a17b18ff812 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/refs/heads/dev diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/13/921096a46cb66610badba272f8211346eaf8f3 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/13/921096a46cb66610badba272f8211346eaf8f3 new file mode 100644 index 0000000000000000000000000000000000000000..6f03cbf003b16b9d2f3ecc83b72da1f9a2746919 GIT binary patch literal 172 zcmV;d08{^X0hQ8A4#FT124J`46r=~JiHXsTCozUV8G*>d@JRLcqE=H{W7;i0`DTWJ zX~*z(w_hDYV#e{L0oTD0qe4(tkk%QaVyI83y3#1|0Z&6zC9iYRH0w9AA(46k5slDf zTS=_|UUJ{#*-+1rv(ivn!(=h1EQi}~?-eZuCD75VpZ=c7VlLU}X?p?wXYlgQ>=Mk= ayd2`JzLyU$2qswmEd8cQ$I$~!pvE`cu8{uYuqMv3a$?pUF6K<$$KO+ zByA@pW7fe7{?KJlHoG0R^iL}; VeGl()4-3z6xYv1F#TTp!NK=zjP3r&v literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/87/aa3a079302a662a9226af3c6e7f444815e3faf b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/87/aa3a079302a662a9226af3c6e7f444815e3faf new file mode 100644 index 0000000000000000000000000000000000000000..666341811ba150199a81ed4a9c19e4a2ff99e504 GIT binary patch literal 261 zcmV+g0s8)U0V^p=O;s>4Ghr|^FfcPQQP4}zEXmDJDa}bOW)PkvFl|ZBwlslVw-*)t zP!x81_2V;CS&*xvi?6F*Nks|6&k2j7N-nO@ka@J4v2Vrww91%k+$IJ(1+cOm} z-fgKcGy@w}oEx81l$e*C5ucxzQ_0}LFttNhL+)DHzvwp8%pksyL6=B1~m z#DfhbPH9GJVhWL_X6B`&RuHMSG_Ry6F*%z!x8!CP7iZ?B$0z6K=4O@@6R@Hb7#Lu0 LVpRtKtXi{;p`>`q literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/a4/aab482be687d2facec638781ded4aa1a92687a b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/a4/aab482be687d2facec638781ded4aa1a92687a new file mode 100644 index 0000000000000000000000000000000000000000..34675b82e4fb366b153b2f23615625d35ddc82c2 GIT binary patch literal 189 zcmV;u07CzG0hQ8A4uUWg1yHB3iiQPX;y|6a5@VWIUWLYfOg~X~Z$&f|h{CkDIsM$n zq+w*c+pmr;Fl8`EP70@}63z)-)5<6%yem$5b_L&%0~v>T7Oad(S+3v6hI+6y_xS(~ zx@thz98>PQJR9m5dKQwWRzF$H361*s#2WHA@Cw@_U;{&;x0XZ8_* r7+KIrV;gPf!Q7Zvfh5 Date: Fri, 10 Jan 2014 22:57:55 -0600 Subject: [PATCH 4/8] Add test for sm_branch_only --- LibGit2Sharp.Tests/SubmoduleFixture.cs | 30 +++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/LibGit2Sharp.Tests/SubmoduleFixture.cs b/LibGit2Sharp.Tests/SubmoduleFixture.cs index d60e61f3e..58c8a830a 100644 --- a/LibGit2Sharp.Tests/SubmoduleFixture.cs +++ b/LibGit2Sharp.Tests/SubmoduleFixture.cs @@ -20,6 +20,26 @@ public void RetrievingSubmoduleForNormalDirectoryReturnsNull() } } + [Fact] + public void RetrievingSubmoduleInBranchShouldWork() + { + var path = SandboxSubmoduleTestRepo(); + using (var repo = new Repository(path)) + { + var submodule = repo.Submodules["sm_branch_only"]; + Assert.Null(submodule); + + repo.Checkout("dev", new CheckoutOptions { CheckoutModifiers = CheckoutModifiers.Force }); + submodule = repo.Submodules["sm_branch_only"]; + Assert.NotNull(submodule); + Assert.NotEqual(SubmoduleStatus.Unmodified, submodule.RetrieveStatus()); + + repo.Checkout("master", new CheckoutOptions { CheckoutModifiers = CheckoutModifiers.Force }); + submodule = repo.Submodules["sm_branch_only"]; + Assert.Null(submodule); + } + } + [Theory] [InlineData("sm_added_and_uncommited", SubmoduleStatus.InConfig | SubmoduleStatus.InIndex | SubmoduleStatus.InWorkDir | SubmoduleStatus.IndexAdded)] [InlineData("sm_changed_file", SubmoduleStatus.InConfig | SubmoduleStatus.InHead | SubmoduleStatus.InIndex | SubmoduleStatus.InWorkDir | SubmoduleStatus.WorkDirFilesModified)] @@ -29,12 +49,20 @@ public void RetrievingSubmoduleForNormalDirectoryReturnsNull() [InlineData("sm_gitmodules_only", SubmoduleStatus.InConfig)] [InlineData("sm_missing_commits", SubmoduleStatus.InConfig | SubmoduleStatus.InHead | SubmoduleStatus.InIndex | SubmoduleStatus.InWorkDir | SubmoduleStatus.WorkDirModified)] [InlineData("sm_unchanged", SubmoduleStatus.InConfig | SubmoduleStatus.InHead | SubmoduleStatus.InIndex | SubmoduleStatus.InWorkDir)] - public void CanRetrieveTheStatusOfASubmodule(string name, SubmoduleStatus expectedStatus) + [InlineData("sm_branch_only", null)] + public void CanRetrieveTheStatusOfASubmodule(string name, SubmoduleStatus? expectedStatus) { var path = SandboxSubmoduleTestRepo(); using (var repo = new Repository(path)) { var submodule = repo.Submodules[name]; + + if (expectedStatus == null) + { + Assert.Null(submodule); + return; + } + Assert.NotNull(submodule); Assert.Equal(name, submodule.Name); Assert.Equal(name, submodule.Path); From ae134fd53724d65765da4761943f94cb1d2fbd11 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Fri, 10 Jan 2014 22:54:30 -0600 Subject: [PATCH 5/8] And in .git/config --- LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/config index d8535d3ac..7eada4ff5 100644 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/config +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/config @@ -18,3 +18,5 @@ url = ../submodule_target_wd [submodule "sm_added_and_uncommited"] url = ../submodule_target_wd +[submodule "sm_branch_only"] + url = ../submodule_target_wd From b482aca72639773c47cb93b03d1f7f2e238f64ab Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Fri, 10 Jan 2014 22:54:55 -0600 Subject: [PATCH 6/8] And in .git/modules --- .../dot_git/modules/sm_branch_only/HEAD | 1 + .../dot_git/modules/sm_branch_only/config | 16 ++++++++++++++++ .../dot_git/modules/sm_branch_only/index | Bin 0 -> 192 bytes .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 0 -> 55 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 0 -> 53 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 0 -> 93 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 0 -> 163 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 0 -> 163 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 0 -> 167 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 ++ .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 0 -> 93 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 ++ .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 ++ .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 0 -> 81 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 0 -> 93 bytes .../dot_git/modules/sm_branch_only/packed-refs | 2 ++ .../modules/sm_branch_only/refs/heads/master | 1 + .../sm_branch_only/refs/remotes/origin/HEAD | 1 + 18 files changed, 27 insertions(+) create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/HEAD create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/config create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/index create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/41/bd4bc3df978de695f67ace64c560913da11653 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/5e/4963595a9774b90524d35a807169049de8ccad create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/6b/31c659545507c381e9cd34ec508f16c04e149e create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/73/ba924a80437097795ae839e66e187c55d3babf create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/9efbdadaa4a582778d4584385495559ea0994b create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/packed-refs create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/heads/master create mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/remotes/origin/HEAD diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/config b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/config new file mode 100644 index 000000000..d00ee8884 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/config @@ -0,0 +1,16 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + worktree = ../../../sm_branch_only + symlinks = false + ignorecase = true + hideDotFiles = dotGitOnly +[remote "origin"] + url = ../../../../submodule_target_wd + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master + rebase = true diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/index b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/index new file mode 100644 index 0000000000000000000000000000000000000000..a30232ec4c0681612e33e503c16a27b8dd402fb1 GIT binary patch literal 192 zcmZ?q402{*U|<5_pbKZZfHVV)2C*TaaS4nCq_Zk`i>H5m@#9PR@6he*t(-K`P366=EfyhDL+34+>CM2GmYI_p mUy>i6o1c=IRteHuGNbACGKNKR)2>XJu=C}H>vQh6ECvAYg*k!% literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 new file mode 100644 index 0000000000000000000000000000000000000000..f4b7094c52b2b13a955016da7ed894453ab9813c GIT binary patch literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 new file mode 100644 index 0000000000000000000000000000000000000000..56c845e49de66164d68d3f7439e2aedcb220c498 GIT binary patch literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 new file mode 100644 index 0000000000000000000000000000000000000000..bd179b5f5406f12f948b97d871c763cc0e10b06f GIT binary patch literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/41/bd4bc3df978de695f67ace64c560913da11653 new file mode 100644 index 0000000000000000000000000000000000000000..ccf49bd15cac3c2bac13fa644f20924a6928dead GIT binary patch literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a new file mode 100644 index 000000000..6d27af8a8 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a @@ -0,0 +1,2 @@ +x-10 Fa0p(N-ӡғq]>ks*? |m“i@mV'`).-1 x +uxt(+ \ No newline at end of file diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/9efbdadaa4a582778d4584385495559ea0994b new file mode 100644 index 000000000..17458840b --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/9efbdadaa4a582778d4584385495559ea0994b @@ -0,0 +1,2 @@ +x 0 )?= NlOkj8&r +qJW7B<fK8#Q1C-"e̫>'@ \ No newline at end of file diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e new file mode 100644 index 0000000000000000000000000000000000000000..83cc29fb159ab59087d724473642a0057d841358 GIT binary patch literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 new file mode 100644 index 0000000000000000000000000000000000000000..55bda40ef277279310f6bf3122497c14602374d6 GIT binary patch literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! literal 0 HcmV?d00001 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/packed-refs b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/packed-refs new file mode 100644 index 000000000..def303a5f --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled +480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/heads/master new file mode 100644 index 000000000..e12c44d7a --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/heads/master @@ -0,0 +1 @@ +480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/remotes/origin/HEAD new file mode 100644 index 000000000..6efe28fff --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master From 7c81d05d9e0202fd1f7b613427c2f4c24b611618 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 16 May 2015 03:38:21 -0500 Subject: [PATCH 7/8] Ignore extra test resource files --- LibGit2Sharp.Tests/Resources/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/LibGit2Sharp.Tests/Resources/.gitignore b/LibGit2Sharp.Tests/Resources/.gitignore index 29ebe04b9..6b70b2273 100644 --- a/LibGit2Sharp.Tests/Resources/.gitignore +++ b/LibGit2Sharp.Tests/Resources/.gitignore @@ -1 +1,6 @@ *.sample +COMMIT_EDITMSG +exclude +logs/ +!testrepo_wd/dot_git/logs/ +description From 0445aaa011c112b2c24f97642d99a3eb475ddb4b Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 16 May 2015 03:49:29 -0500 Subject: [PATCH 8/8] Remove extra test resource files --- .../assume_unchanged_wd/dot_git/logs/HEAD | 1 - .../dot_git/logs/refs/heads/master | 1 - .../merge_testrepo_wd/dot_git/description | 1 - .../Resources/merge_testrepo_wd/dot_git/logs/HEAD | 9 --------- .../dot_git/logs/refs/heads/conflicts | 2 -- .../dot_git/logs/refs/heads/fast_forward | 2 -- .../dot_git/logs/refs/heads/master | 2 -- .../dot_git/logs/refs/heads/normal_merge | 2 -- .../dot_git/logs/refs/heads/rename | 3 --- .../dot_git/logs/refs/heads/rename_source | 2 -- .../Resources/mergedrepo_wd/dot_git/description | 1 - .../Resources/mergedrepo_wd/dot_git/logs/HEAD | 15 --------------- .../mergedrepo_wd/dot_git/logs/refs/heads/branch | 4 ---- .../mergedrepo_wd/dot_git/logs/refs/heads/master | 4 ---- .../Resources/mergerenames_wd/dot_git/logs/HEAD | 1 - .../dot_git/logs/refs/heads/master | 1 - .../submodule_small_wd/dot_git/description | 1 - .../submodule_target_wd/dot_git/description | 1 - .../submodule_target_wd/dot_git/logs/HEAD | 4 ---- .../dot_git/logs/refs/heads/master | 4 ---- .../Resources/submodule_wd/dot_git/description | 1 - .../Resources/submodule_wd/dot_git/info/exclude | 6 ------ .../Resources/submodule_wd/dot_git/logs/HEAD | 4 ---- .../submodule_wd/dot_git/logs/refs/heads/master | 4 ---- .../modules/sm_added_and_uncommited/description | 1 - .../modules/sm_added_and_uncommited/info/exclude | 6 ------ .../modules/sm_added_and_uncommited/logs/HEAD | 1 - .../logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../dot_git/modules/sm_changed_file/description | 1 - .../dot_git/modules/sm_changed_file/info/exclude | 6 ------ .../dot_git/modules/sm_changed_file/logs/HEAD | 1 - .../sm_changed_file/logs/refs/heads/master | 1 - .../sm_changed_file/logs/refs/remotes/origin/HEAD | 1 - .../modules/sm_changed_head/COMMIT_EDITMSG | 1 - .../dot_git/modules/sm_changed_head/description | 1 - .../dot_git/modules/sm_changed_head/info/exclude | 6 ------ .../dot_git/modules/sm_changed_head/logs/HEAD | 2 -- .../sm_changed_head/logs/refs/heads/master | 2 -- .../sm_changed_head/logs/refs/remotes/origin/HEAD | 1 - .../dot_git/modules/sm_changed_index/description | 1 - .../dot_git/modules/sm_changed_index/info/exclude | 6 ------ .../dot_git/modules/sm_changed_index/logs/HEAD | 1 - .../sm_changed_index/logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../modules/sm_changed_untracked_file/description | 1 - .../sm_changed_untracked_file/info/exclude | 6 ------ .../modules/sm_changed_untracked_file/logs/HEAD | 1 - .../logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../modules/sm_missing_commits/description | 1 - .../modules/sm_missing_commits/info/exclude | 6 ------ .../dot_git/modules/sm_missing_commits/logs/HEAD | 1 - .../sm_missing_commits/logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../dot_git/modules/sm_unchanged/description | 1 - .../dot_git/modules/sm_unchanged/info/exclude | 6 ------ .../dot_git/modules/sm_unchanged/logs/HEAD | 1 - .../modules/sm_unchanged/logs/refs/heads/master | 1 - .../sm_unchanged/logs/refs/remotes/origin/HEAD | 1 - .../not_submodule/dot_git/description | 1 - .../submodule_wd/not_submodule/dot_git/logs/HEAD | 1 - .../not_submodule/dot_git/logs/refs/heads/master | 1 - .../Resources/testrepo_wd/dot_git/description | 1 - 64 files changed, 153 deletions(-) delete mode 100644 LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/description delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/conflicts delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/fast_forward delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/normal_merge delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename delete mode 100644 LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename_source delete mode 100644 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description delete mode 100644 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch delete mode 100644 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_small_wd/dot_git/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/remotes/origin/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/COMMIT_EDITMSG delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/remotes/origin/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/remotes/origin/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/info/exclude delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/remotes/origin/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/description delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/HEAD delete mode 100644 LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/refs/heads/master delete mode 100644 LibGit2Sharp.Tests/Resources/testrepo_wd/dot_git/description diff --git a/LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/HEAD deleted file mode 100644 index 8a423a7ae..000000000 --- a/LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 872129051d644790636b416d1ef1ec830c5f6b90 nulltoken 1422023333 +0100 commit (initial): Initial commit diff --git a/LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/refs/heads/master deleted file mode 100644 index 8a423a7ae..000000000 --- a/LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 872129051d644790636b416d1ef1ec830c5f6b90 nulltoken 1422023333 +0100 commit (initial): Initial commit diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/description b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/HEAD deleted file mode 100644 index 9e2a5c74a..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller 1393902455 -0500 commit (initial): Initial commit -a3ccc66533922b02858da9ed489cd19d573d6378 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller 1393902574 -0500 commit: Second commit on master -83cebf5389a4adbcb80bda6b68513caee4559802 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller 1393902595 -0500 checkout: moving from master to fast_forward -83cebf5389a4adbcb80bda6b68513caee4559802 4dfaa1500526214ae7b33f9b2c1144ca8b6b1f53 Jameson Miller 1393902643 -0500 commit: Commit on fast_forward -4dfaa1500526214ae7b33f9b2c1144ca8b6b1f53 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller 1393902655 -0500 checkout: moving from fast_forward to normal_merge -a3ccc66533922b02858da9ed489cd19d573d6378 625186280ed2a6ec9b65d250ed90cf2e4acef957 Jameson Miller 1393902725 -0500 commit: Commit on normal_merge -625186280ed2a6ec9b65d250ed90cf2e4acef957 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller 1393902735 -0500 checkout: moving from normal_merge to conflicts -a3ccc66533922b02858da9ed489cd19d573d6378 0771966a0d112d3787006a6fda5b6226a770e15a Jameson Miller 1393902760 -0500 commit: Commit on conflicts -0771966a0d112d3787006a6fda5b6226a770e15a 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller 1393907470 -0500 checkout: moving from conflicts to master diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/conflicts b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/conflicts deleted file mode 100644 index bf17c1056..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/conflicts +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller 1393902539 -0500 branch: Created from master -a3ccc66533922b02858da9ed489cd19d573d6378 0771966a0d112d3787006a6fda5b6226a770e15a Jameson Miller 1393902760 -0500 commit: Commit on conflicts diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/fast_forward b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/fast_forward deleted file mode 100644 index 9b3d80c28..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/fast_forward +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller 1393902591 -0500 branch: Created from master -83cebf5389a4adbcb80bda6b68513caee4559802 4dfaa1500526214ae7b33f9b2c1144ca8b6b1f53 Jameson Miller 1393902643 -0500 commit: Commit on fast_forward diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/master deleted file mode 100644 index 8201a1408..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller 1393902455 -0500 commit (initial): Initial commit -a3ccc66533922b02858da9ed489cd19d573d6378 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller 1393902574 -0500 commit: Second commit on master diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/normal_merge b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/normal_merge deleted file mode 100644 index e17413bdb..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/normal_merge +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller 1393902530 -0500 branch: Created from master -a3ccc66533922b02858da9ed489cd19d573d6378 625186280ed2a6ec9b65d250ed90cf2e4acef957 Jameson Miller 1393902725 -0500 commit: Commit on normal_merge diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename deleted file mode 100644 index a2466a9d2..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller 1398366152 -0400 branch: Created from HEAD -83cebf5389a4adbcb80bda6b68513caee4559802 9075c06ff9cd736610dea688bca7e912903ff2d1 Jameson Miller 1398366254 -0400 commit: Add content to b.txt -9075c06ff9cd736610dea688bca7e912903ff2d1 24434077dec097c1203ef9e1345c0545c190936a Jameson Miller 1398366641 -0400 commit: edit to b.txt diff --git a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename_source b/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename_source deleted file mode 100644 index 1515dd26e..000000000 --- a/LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename_source +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 9075c06ff9cd736610dea688bca7e912903ff2d1 Jameson Miller 1398366267 -0400 branch: Created from rename -9075c06ff9cd736610dea688bca7e912903ff2d1 2bc71d0e8acfbb9fd1cc2d9d48c23dbf8aea52c9 Jameson Miller 1398366593 -0400 commit: rename and edit b.txt diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD deleted file mode 100644 index 839dfc811..000000000 --- a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD +++ /dev/null @@ -1,15 +0,0 @@ -0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson 1360632480 -0600 commit (initial): ancestor -9107b30fe11ff310fec93876469147b263fb958c 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson 1360632483 -0600 checkout: moving from master to branch -9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson 1360632833 -0600 commit: branch -d4c107581ff54a41fd496e0a1f1b7b3354752103 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson 1360632835 -0600 checkout: moving from branch to master -9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson 1360633224 -0600 commit: ours -8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson 1360633337 -0600 commit: ours -91116bad97c50a2daa278ca6cffe16d0118befe5 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson 1360633358 -0600 checkout: moving from master to 8b19fd7 -8b19fd77de5995e6e502e7c3b82657248f510325 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson 1360633359 -0600 rebase -i (squash): ours -9b2f98b1c086d3929eac387d39fae94425e0115f 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson 1360633362 -0600 rebase -i (finish): returning to refs/heads/master -9b2f98b1c086d3929eac387d39fae94425e0115f d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson 1360633367 -0600 checkout: moving from master to branch -d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson 1360633416 -0600 commit: branch -493209f496e504d63fd78e8c5b800083b442ea34 d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson 1360633427 -0600 checkout: moving from branch to d4c1075 -d4c107581ff54a41fd496e0a1f1b7b3354752103 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson 1360633429 -0600 rebase -i (squash): branch -8eefb6f8061e4d10a7a59aac8771dc17958d93eb 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson 1360633436 -0600 rebase -i (finish): returning to refs/heads/branch -8eefb6f8061e4d10a7a59aac8771dc17958d93eb 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson 1360633440 -0600 checkout: moving from branch to master diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch deleted file mode 100644 index 13819577f..000000000 --- a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson 1360632483 -0600 branch: Created from HEAD -9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson 1360632833 -0600 commit: branch -d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson 1360633416 -0600 commit: branch -493209f496e504d63fd78e8c5b800083b442ea34 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson 1360633436 -0600 rebase -i (finish): refs/heads/branch onto d4c1075 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master deleted file mode 100644 index 167ae3e56..000000000 --- a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson 1360632480 -0600 commit (initial): ancestor -9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson 1360633224 -0600 commit: ours -8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson 1360633337 -0600 commit: ours -91116bad97c50a2daa278ca6cffe16d0118befe5 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson 1360633362 -0600 rebase -i (finish): refs/heads/master onto 8b19fd7 diff --git a/LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/HEAD deleted file mode 100644 index 7b5293fd3..000000000 --- a/LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1365715620 -0500 moving to bd59328 diff --git a/LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/refs/heads/master deleted file mode 100644 index a46518da8..000000000 --- a/LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875584 -0500 reset: moving to 977c696519c5a3004c5f1d15d60c89dbeb8f235f diff --git a/LibGit2Sharp.Tests/Resources/submodule_small_wd/dot_git/description b/LibGit2Sharp.Tests/Resources/submodule_small_wd/dot_git/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_small_wd/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/description b/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/HEAD deleted file mode 100644 index 0ecd1113f..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 6b31c659545507c381e9cd34ec508f16c04e149e Russell Belfer 1342559662 -0700 commit (initial): Initial commit -6b31c659545507c381e9cd34ec508f16c04e149e 41bd4bc3df978de695f67ace64c560913da11653 Russell Belfer 1342559709 -0700 commit: Adding test file -41bd4bc3df978de695f67ace64c560913da11653 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559726 -0700 commit: Updating test file -5e4963595a9774b90524d35a807169049de8ccad 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342559925 -0700 commit: One more update diff --git a/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/refs/heads/master deleted file mode 100644 index 0ecd1113f..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 6b31c659545507c381e9cd34ec508f16c04e149e Russell Belfer 1342559662 -0700 commit (initial): Initial commit -6b31c659545507c381e9cd34ec508f16c04e149e 41bd4bc3df978de695f67ace64c560913da11653 Russell Belfer 1342559709 -0700 commit: Adding test file -41bd4bc3df978de695f67ace64c560913da11653 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559726 -0700 commit: Updating test file -5e4963595a9774b90524d35a807169049de8ccad 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342559925 -0700 commit: One more update diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/HEAD deleted file mode 100644 index 2cf2ca74d..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 14fe9ccf104058df25e0a08361c4494e167ef243 Russell Belfer 1342559771 -0700 commit (initial): Initial commit -14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer 1342559831 -0700 commit: Adding a submodule -a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer 1342560036 -0700 commit: Updating submodule -5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer 1342560288 -0700 commit: Adding a bunch more test content diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/refs/heads/master deleted file mode 100644 index 2cf2ca74d..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 14fe9ccf104058df25e0a08361c4494e167ef243 Russell Belfer 1342559771 -0700 commit (initial): Initial commit -14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer 1342559831 -0700 commit: Adding a submodule -a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer 1342560036 -0700 commit: Updating submodule -5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer 1342560288 -0700 commit: Adding a bunch more test content diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/HEAD deleted file mode 100644 index 53753e7dd..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560316 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/heads/master deleted file mode 100644 index 53753e7dd..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560316 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 53753e7dd..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560316 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/HEAD deleted file mode 100644 index e5cb63f8d..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560173 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/heads/master deleted file mode 100644 index e5cb63f8d..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560173 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/remotes/origin/HEAD deleted file mode 100644 index e5cb63f8d..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560173 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/COMMIT_EDITMSG b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/COMMIT_EDITMSG deleted file mode 100644 index 6b8d1e3fc..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -Making a change in a submodule diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/HEAD deleted file mode 100644 index cabdeb2b5..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560179 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target -480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer 1342560431 -0700 commit: Making a change in a submodule diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/heads/master deleted file mode 100644 index cabdeb2b5..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560179 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target -480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer 1342560431 -0700 commit: Making a change in a submodule diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 257ca21d1..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560179 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/HEAD deleted file mode 100644 index 80eb54102..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560175 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/heads/master deleted file mode 100644 index 80eb54102..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560175 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 80eb54102..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560175 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/HEAD deleted file mode 100644 index d1beafbd6..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560186 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/heads/master deleted file mode 100644 index d1beafbd6..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560186 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD deleted file mode 100644 index d1beafbd6..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560186 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/HEAD deleted file mode 100644 index ee08c9706..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559796 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/heads/master deleted file mode 100644 index ee08c9706..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559796 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD deleted file mode 100644 index ee08c9706..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559796 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/description b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/info/exclude b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/HEAD deleted file mode 100644 index 72653286a..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560169 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/heads/master deleted file mode 100644 index 72653286a..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560169 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/remotes/origin/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 72653286a..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_unchanged/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560169 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/description b/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/description deleted file mode 100644 index 498b267a8..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/HEAD deleted file mode 100644 index 1749e7dff..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 68e92c611b80ee1ed8f38314ff9577f0d15b2444 Russell Belfer 1342560358 -0700 commit (initial): Initial commit diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/refs/heads/master deleted file mode 100644 index 1749e7dff..000000000 --- a/LibGit2Sharp.Tests/Resources/submodule_wd/not_submodule/dot_git/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 68e92c611b80ee1ed8f38314ff9577f0d15b2444 Russell Belfer 1342560358 -0700 commit (initial): Initial commit diff --git a/LibGit2Sharp.Tests/Resources/testrepo_wd/dot_git/description b/LibGit2Sharp.Tests/Resources/testrepo_wd/dot_git/description deleted file mode 100644 index 893e5cad2..000000000 --- a/LibGit2Sharp.Tests/Resources/testrepo_wd/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository.