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
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
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 <emeric.fermas@gmail.com> 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 <emeric.fermas@gmail.com> 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 <jamill@microsoft.com> 1393902455 -0500	commit (initial): Initial commit
-a3ccc66533922b02858da9ed489cd19d573d6378 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller <jamill@microsoft.com> 1393902574 -0500	commit: Second commit on master
-83cebf5389a4adbcb80bda6b68513caee4559802 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller <jamill@microsoft.com> 1393902595 -0500	checkout: moving from master to fast_forward
-83cebf5389a4adbcb80bda6b68513caee4559802 4dfaa1500526214ae7b33f9b2c1144ca8b6b1f53 Jameson Miller <jamill@microsoft.com> 1393902643 -0500	commit: Commit on fast_forward
-4dfaa1500526214ae7b33f9b2c1144ca8b6b1f53 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller <jamill@microsoft.com> 1393902655 -0500	checkout: moving from fast_forward to normal_merge
-a3ccc66533922b02858da9ed489cd19d573d6378 625186280ed2a6ec9b65d250ed90cf2e4acef957 Jameson Miller <jamill@microsoft.com> 1393902725 -0500	commit: Commit on normal_merge
-625186280ed2a6ec9b65d250ed90cf2e4acef957 a3ccc66533922b02858da9ed489cd19d573d6378 Jameson Miller <jamill@microsoft.com> 1393902735 -0500	checkout: moving from normal_merge to conflicts
-a3ccc66533922b02858da9ed489cd19d573d6378 0771966a0d112d3787006a6fda5b6226a770e15a Jameson Miller <jamill@microsoft.com> 1393902760 -0500	commit: Commit on conflicts
-0771966a0d112d3787006a6fda5b6226a770e15a 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller <jamill@microsoft.com> 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 <jamill@microsoft.com> 1393902539 -0500	branch: Created from master
-a3ccc66533922b02858da9ed489cd19d573d6378 0771966a0d112d3787006a6fda5b6226a770e15a Jameson Miller <jamill@microsoft.com> 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 <jamill@microsoft.com> 1393902591 -0500	branch: Created from master
-83cebf5389a4adbcb80bda6b68513caee4559802 4dfaa1500526214ae7b33f9b2c1144ca8b6b1f53 Jameson Miller <jamill@microsoft.com> 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 <jamill@microsoft.com> 1393902455 -0500	commit (initial): Initial commit
-a3ccc66533922b02858da9ed489cd19d573d6378 83cebf5389a4adbcb80bda6b68513caee4559802 Jameson Miller <jamill@microsoft.com> 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 <jamill@microsoft.com> 1393902530 -0500	branch: Created from master
-a3ccc66533922b02858da9ed489cd19d573d6378 625186280ed2a6ec9b65d250ed90cf2e4acef957 Jameson Miller <jamill@microsoft.com> 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 <jamill@microsoft.com> 1398366152 -0400	branch: Created from HEAD
-83cebf5389a4adbcb80bda6b68513caee4559802 9075c06ff9cd736610dea688bca7e912903ff2d1 Jameson Miller <jamill@microsoft.com> 1398366254 -0400	commit: Add content to b.txt
-9075c06ff9cd736610dea688bca7e912903ff2d1 24434077dec097c1203ef9e1345c0545c190936a Jameson Miller <jamill@microsoft.com> 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 <jamill@microsoft.com> 1398366267 -0400	branch: Created from rename
-9075c06ff9cd736610dea688bca7e912903ff2d1 2bc71d0e8acfbb9fd1cc2d9d48c23dbf8aea52c9 Jameson Miller <jamill@microsoft.com> 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 <ethomson@microsoft.com> 1360632480 -0600	commit (initial): ancestor
-9107b30fe11ff310fec93876469147b263fb958c 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632483 -0600	checkout: moving from master to branch
-9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360632833 -0600	commit: branch
-d4c107581ff54a41fd496e0a1f1b7b3354752103 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632835 -0600	checkout: moving from branch to master
-9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633224 -0600	commit: ours
-8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson <ethomson@microsoft.com> 1360633337 -0600	commit: ours
-91116bad97c50a2daa278ca6cffe16d0118befe5 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633358 -0600	checkout: moving from master to 8b19fd7
-8b19fd77de5995e6e502e7c3b82657248f510325 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633359 -0600	rebase -i (squash): ours
-9b2f98b1c086d3929eac387d39fae94425e0115f 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633362 -0600	rebase -i (finish): returning to refs/heads/master
-9b2f98b1c086d3929eac387d39fae94425e0115f d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360633367 -0600	checkout: moving from master to branch
-d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson <ethomson@microsoft.com> 1360633416 -0600	commit: branch
-493209f496e504d63fd78e8c5b800083b442ea34 d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360633427 -0600	checkout: moving from branch to d4c1075
-d4c107581ff54a41fd496e0a1f1b7b3354752103 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633429 -0600	rebase -i (squash): branch
-8eefb6f8061e4d10a7a59aac8771dc17958d93eb 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633436 -0600	rebase -i (finish): returning to refs/heads/branch
-8eefb6f8061e4d10a7a59aac8771dc17958d93eb 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 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 <ethomson@microsoft.com> 1360632483 -0600	branch: Created from HEAD
-9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360632833 -0600	commit: branch
-d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson <ethomson@microsoft.com> 1360633416 -0600	commit: branch
-493209f496e504d63fd78e8c5b800083b442ea34 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 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 <ethomson@microsoft.com> 1360632480 -0600	commit (initial): ancestor
-9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633224 -0600	commit: ours
-8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson <ethomson@microsoft.com> 1360633337 -0600	commit: ours
-91116bad97c50a2daa278ca6cffe16d0118befe5 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 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 <ethomson@microsoft.com> 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 <ethomson@edwardthomson.com> 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 <rb@github.com> 1342559662 -0700	commit (initial): Initial commit
-6b31c659545507c381e9cd34ec508f16c04e149e 41bd4bc3df978de695f67ace64c560913da11653 Russell Belfer <rb@github.com> 1342559709 -0700	commit: Adding test file
-41bd4bc3df978de695f67ace64c560913da11653 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer <rb@github.com> 1342559726 -0700	commit: Updating test file
-5e4963595a9774b90524d35a807169049de8ccad 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 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 <rb@github.com> 1342559662 -0700	commit (initial): Initial commit
-6b31c659545507c381e9cd34ec508f16c04e149e 41bd4bc3df978de695f67ace64c560913da11653 Russell Belfer <rb@github.com> 1342559709 -0700	commit: Adding test file
-41bd4bc3df978de695f67ace64c560913da11653 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer <rb@github.com> 1342559726 -0700	commit: Updating test file
-5e4963595a9774b90524d35a807169049de8ccad 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer <rb@github.com> 1342559925 -0700	commit: One more update
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
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 <rb@github.com> 1342559771 -0700	commit (initial): Initial commit
-14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer <rb@github.com> 1342559831 -0700	commit: Adding a submodule
-a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer <rb@github.com> 1342560036 -0700	commit: Updating submodule
-5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer <rb@github.com> 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 <rb@github.com> 1342559771 -0700	commit (initial): Initial commit
-14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer <rb@github.com> 1342559831 -0700	commit: Adding a submodule
-a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer <rb@github.com> 1342560036 -0700	commit: Updating submodule
-5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer <rb@github.com> 1342560288 -0700	commit: Adding a bunch more test content
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_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 <rb@github.com> 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 <rb@github.com> 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 <rb@github.com> 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_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 000000000..a30232ec4
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/index differ
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 000000000..f4b7094c5
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 differ
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 000000000..56c845e49
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 differ
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 000000000..bd179b5f5
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 differ
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 000000000..ccf49bd15
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/41/bd4bc3df978de695f67ace64c560913da11653 differ
diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/48/0095882d281ed676fe5b863569520e54a7d5c0
new file mode 100644
index 000000000..53029069a
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 differ
diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/5e/4963595a9774b90524d35a807169049de8ccad b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/5e/4963595a9774b90524d35a807169049de8ccad
new file mode 100644
index 000000000..38c791eba
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/5e/4963595a9774b90524d35a807169049de8ccad differ
diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/6b/31c659545507c381e9cd34ec508f16c04e149e b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/6b/31c659545507c381e9cd34ec508f16c04e149e
new file mode 100644
index 000000000..a26d29993
--- /dev/null
+++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/6b/31c659545507c381e9cd34ec508f16c04e149e
@@ -0,0 +1,2 @@
+x
��Q
+!E�vo��y*�_��@�g#h���Oh�^�9w�����Sòf1*���[������Ic Ԥ���p���k�Α\���S߇�l��@.��^�QpF�(�:��D�5��zr~	�en8
\ No newline at end of file
diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/73/ba924a80437097795ae839e66e187c55d3babf b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/73/ba924a80437097795ae839e66e187c55d3babf
new file mode 100644
index 000000000..83d1ba481
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/73/ba924a80437097795ae839e66e187c55d3babf differ
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
-�1�0Fa����0p�����(N-����ӡғ���q]>ks�*�?	|m“���i�@�����m��V����'��`)�.�-1�x
+u�x��t(+
\ 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�)��?=
���N�lO�k���j����8&�����r
�
+�qJW�7��B<����f��K8�#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 000000000..83cc29fb1
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e differ
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 000000000..55bda40ef
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 differ
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
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_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 <rb@github.com> 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 <rb@github.com> 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 <rb@github.com> 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/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_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 <rb@github.com> 1342560179 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target
-480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer <rb@github.com> 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 <rb@github.com> 1342560179 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target
-480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer <rb@github.com> 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 <rb@github.com> 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/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_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 <rb@github.com> 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 <rb@github.com> 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 <rb@github.com> 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/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_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 <rb@github.com> 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 <rb@github.com> 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 <rb@github.com> 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/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_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 <rb@github.com> 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 <rb@github.com> 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 <rb@github.com> 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/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
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 <rb@github.com> 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 <rb@github.com> 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 <rb@github.com> 1342560169 -0700	clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target
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 000000000..6f03cbf00
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/13/921096a46cb66610badba272f8211346eaf8f3 differ
diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/6b/94d06e586d4ed904d8c00a9de7d0afe0fc9c3c b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/6b/94d06e586d4ed904d8c00a9de7d0afe0fc9c3c
new file mode 100644
index 000000000..21bbe6d2b
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/6b/94d06e586d4ed904d8c00a9de7d0afe0fc9c3c differ
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 000000000..666341811
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/87/aa3a079302a662a9226af3c6e7f444815e3faf differ
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 000000000..34675b82e
Binary files /dev/null and b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/a4/aab482be687d2facec638781ded4aa1a92687a differ
diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/cf/27c0500009f6d12fd82d841ecf6a17b18ff812 b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/cf/27c0500009f6d12fd82d841ecf6a17b18ff812
new file mode 100644
index 000000000..d620874b9
--- /dev/null
+++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/objects/cf/27c0500009f6d12fd82d841ecf6a17b18ff812
@@ -0,0 +1,2 @@
+x
��K� `��)HP��“C�������z{�jS���-?�f�HC�f�]\ �� j��J8'4ǝQJx����G{��U�2&m���r��֙t׃挦�x\��-|���4Yf
+M�m�ej� ����d���Н�ч�NY�4ڠ)�c6"�܍�\���9l���}��2�X�;7�N�?�Y� h
\ No newline at end of file
diff --git a/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/refs/heads/dev b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/refs/heads/dev
new file mode 100644
index 000000000..9cbe3f817
--- /dev/null
+++ b/LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/refs/heads/dev
@@ -0,0 +1 @@
+6b94d06e586d4ed904d8c00a9de7d0afe0fc9c3c
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 <rb@github.com> 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 <rb@github.com> 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.
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);