diff --git a/test/assets/attributes_repo/.gitdir/branches/empty_marker b/test/assets/attributes_repo/.gitdir/branches/.empty_marker
similarity index 100%
rename from test/assets/attributes_repo/.gitdir/branches/empty_marker
rename to test/assets/attributes_repo/.gitdir/branches/.empty_marker
diff --git a/test/assets/blame_repo/.gitdir/branches/empty_marker b/test/assets/attributes_repo/.gitdir/objects/info/.empty_marker
similarity index 100%
rename from test/assets/blame_repo/.gitdir/branches/empty_marker
rename to test/assets/attributes_repo/.gitdir/objects/info/.empty_marker
diff --git a/test/assets/dirty_repo/.gitdir/branches/empty_marker b/test/assets/attributes_repo/.gitdir/objects/pack/.empty_marker
similarity index 100%
rename from test/assets/dirty_repo/.gitdir/branches/empty_marker
rename to test/assets/attributes_repo/.gitdir/objects/pack/.empty_marker
diff --git a/test/assets/dirty_repo/.gitdir/objects/info/empty_marker b/test/assets/blame_repo/.gitdir/branches/.empty_marker
similarity index 100%
rename from test/assets/dirty_repo/.gitdir/objects/info/empty_marker
rename to test/assets/blame_repo/.gitdir/branches/.empty_marker
diff --git a/test/assets/dirty_repo/.gitdir/objects/pack/empty_marker b/test/assets/blame_repo/.gitdir/objects/info/.empty_marker
similarity index 100%
rename from test/assets/dirty_repo/.gitdir/objects/pack/empty_marker
rename to test/assets/blame_repo/.gitdir/objects/info/.empty_marker
diff --git a/test/assets/dirty_repo/.gitdir/refs/tags/empty_marker b/test/assets/blame_repo/.gitdir/objects/pack/.empty_marker
similarity index 100%
rename from test/assets/dirty_repo/.gitdir/refs/tags/empty_marker
rename to test/assets/blame_repo/.gitdir/objects/pack/.empty_marker
diff --git a/test/assets/empty_bare.git/branches/empty_marker b/test/assets/dirty_repo/.gitdir/branches/.empty_marker
similarity index 100%
rename from test/assets/empty_bare.git/branches/empty_marker
rename to test/assets/dirty_repo/.gitdir/branches/.empty_marker
diff --git a/test/assets/empty_bare.git/objects/info/empty_marker b/test/assets/dirty_repo/.gitdir/objects/info/.empty_marker
similarity index 100%
rename from test/assets/empty_bare.git/objects/info/empty_marker
rename to test/assets/dirty_repo/.gitdir/objects/info/.empty_marker
diff --git a/test/assets/empty_bare.git/objects/pack/empty_marker b/test/assets/dirty_repo/.gitdir/objects/pack/.empty_marker
similarity index 100%
rename from test/assets/empty_bare.git/objects/pack/empty_marker
rename to test/assets/dirty_repo/.gitdir/objects/pack/.empty_marker
diff --git a/test/assets/empty_bare.git/refs/heads/empty_marker b/test/assets/dirty_repo/.gitdir/refs/tags/.empty_marker
similarity index 100%
rename from test/assets/empty_bare.git/refs/heads/empty_marker
rename to test/assets/dirty_repo/.gitdir/refs/tags/.empty_marker
diff --git a/test/assets/empty_bare.git/refs/tags/empty_marker b/test/assets/empty_bare.git/branches/.empty_marker
similarity index 100%
rename from test/assets/empty_bare.git/refs/tags/empty_marker
rename to test/assets/empty_bare.git/branches/.empty_marker
diff --git a/test/assets/empty_standard/.gitdir/branches/empty_marker b/test/assets/empty_bare.git/objects/info/.empty_marker
similarity index 100%
rename from test/assets/empty_standard/.gitdir/branches/empty_marker
rename to test/assets/empty_bare.git/objects/info/.empty_marker
diff --git a/test/assets/empty_standard/.gitdir/objects/info/empty_marker b/test/assets/empty_bare.git/objects/pack/.empty_marker
similarity index 100%
rename from test/assets/empty_standard/.gitdir/objects/info/empty_marker
rename to test/assets/empty_bare.git/objects/pack/.empty_marker
diff --git a/test/assets/empty_standard/.gitdir/objects/pack/empty_marker b/test/assets/empty_bare.git/refs/heads/.empty_marker
similarity index 100%
rename from test/assets/empty_standard/.gitdir/objects/pack/empty_marker
rename to test/assets/empty_bare.git/refs/heads/.empty_marker
diff --git a/test/assets/empty_standard/.gitdir/refs/heads/empty_marker b/test/assets/empty_bare.git/refs/tags/.empty_marker
similarity index 100%
rename from test/assets/empty_standard/.gitdir/refs/heads/empty_marker
rename to test/assets/empty_bare.git/refs/tags/.empty_marker
diff --git a/test/assets/empty_standard/.gitdir/refs/tags/empty_marker b/test/assets/empty_standard/.gitdir/branches/.empty_marker
similarity index 100%
rename from test/assets/empty_standard/.gitdir/refs/tags/empty_marker
rename to test/assets/empty_standard/.gitdir/branches/.empty_marker
diff --git a/test/assets/mailmap_repo/.gitdir/branches/empty_marker b/test/assets/empty_standard/.gitdir/objects/info/.empty_marker
similarity index 100%
rename from test/assets/mailmap_repo/.gitdir/branches/empty_marker
rename to test/assets/empty_standard/.gitdir/objects/info/.empty_marker
diff --git a/test/assets/merge_repo/.gitdir/branches/empty_marker b/test/assets/empty_standard/.gitdir/objects/pack/.empty_marker
similarity index 100%
rename from test/assets/merge_repo/.gitdir/branches/empty_marker
rename to test/assets/empty_standard/.gitdir/objects/pack/.empty_marker
diff --git a/test/assets/submodule_repo/.gitdir/objects/info/empty_marker b/test/assets/empty_standard/.gitdir/refs/heads/.empty_marker
similarity index 100%
rename from test/assets/submodule_repo/.gitdir/objects/info/empty_marker
rename to test/assets/empty_standard/.gitdir/refs/heads/.empty_marker
diff --git a/test/assets/submodule_repo/.gitdir/objects/pack/empty_marker b/test/assets/empty_standard/.gitdir/refs/tags/.empty_marker
similarity index 100%
rename from test/assets/submodule_repo/.gitdir/objects/pack/empty_marker
rename to test/assets/empty_standard/.gitdir/refs/tags/.empty_marker
diff --git a/test/assets/submodule_repo/.gitdir/refs/tags/empty_marker b/test/assets/mailmap_repo/.gitdir/branches/.empty_marker
similarity index 100%
rename from test/assets/submodule_repo/.gitdir/refs/tags/empty_marker
rename to test/assets/mailmap_repo/.gitdir/branches/.empty_marker
diff --git a/test/assets/submodule_repo/TestGitRepository/empty_marker b/test/assets/mailmap_repo/.gitdir/objects/info/.empty_marker
similarity index 100%
rename from test/assets/submodule_repo/TestGitRepository/empty_marker
rename to test/assets/mailmap_repo/.gitdir/objects/info/.empty_marker
diff --git a/test/assets/test_repo/.gitdir/branches/empty_marker b/test/assets/mailmap_repo/.gitdir/objects/pack/.empty_marker
similarity index 100%
rename from test/assets/test_repo/.gitdir/branches/empty_marker
rename to test/assets/mailmap_repo/.gitdir/objects/pack/.empty_marker
diff --git a/test/assets/merge_repo/.gitdir/branches/.empty_marker b/test/assets/merge_repo/.gitdir/branches/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/merge_repo/.gitdir/objects/info/.empty_marker b/test/assets/merge_repo/.gitdir/objects/info/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/merge_repo/.gitdir/objects/pack/.empty_marker b/test/assets/merge_repo/.gitdir/objects/pack/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/submodule_repo/.gitdir/objects/info/.empty_marker b/test/assets/submodule_repo/.gitdir/objects/info/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/submodule_repo/.gitdir/objects/pack/.empty_marker b/test/assets/submodule_repo/.gitdir/objects/pack/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/submodule_repo/.gitdir/refs/tags/.empty_marker b/test/assets/submodule_repo/.gitdir/refs/tags/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/submodule_repo/TestGitRepository/.empty_marker b/test/assets/submodule_repo/TestGitRepository/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/test_repo/.gitdir/branches/.empty_marker b/test/assets/test_repo/.gitdir/branches/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/test_repo/.gitdir/objects/info/.empty_marker b/test/assets/test_repo/.gitdir/objects/info/.empty_marker
new file mode 100644
index 0000000..e69de29
diff --git a/test/assets/test_repo/.gitdir/objects/pack/.empty_marker b/test/assets/test_repo/.gitdir/objects/pack/.empty_marker
new file mode 100644
index 0000000..e69de29