Merge pull request #1051 from libgit2/gh604

Test coverage for branch-only submodule

Author: nulltoken

LibGit2Sharp.Tests/Resources/.gitattributes

@@ -1 +1,4 @@
 * binary
+.gitattributes diff
+.gitignore diff
+config diff

LibGit2Sharp.Tests/Resources/.gitignore

@@ -1 +1,6 @@
 *.sample
+COMMIT_EDITMSG
+exclude
+logs/
+!testrepo_wd/dot_git/logs/
+description

LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/HEAD

@@ -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

LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/refs/heads/master

@@ -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

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/description

@@ -0,0 +1 @@
+ref: refs/heads/master

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/HEAD

@@ -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

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/conflicts

@@ -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

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/fast_forward

@@ -0,0 +1,2 @@
+x
-�1�0Fa����0p�����(N-����ӡғ���q]>ks�*�?	|m“���i�@�����m��V����'��`)�.�-1�x
+u�x��t(+

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/master

@@ -0,0 +1,2 @@
+x
���0�)��?=���N�lO�k���j����8&�����r�
+�qJW�7��B<����f��K8�#Q1C-�"e��̫����>�
'@

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/normal_merge

@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled 
+480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename

@@ -0,0 +1 @@
+480095882d281ed676fe5b863569520e54a7d5c0

LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename_source

@@ -0,0 +1 @@
+ref: refs/remotes/origin/master

LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description

@@ -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

LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD

@@ -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

LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch

@@ -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

LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master

@@ -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

LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/HEAD

@@ -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