Skip to content

Test coverage for branch-only submodule #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 19, 2015
Merged

Test coverage for branch-only submodule #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ae8e4c
Show diff for test resource text artifacts
dahlbyk May 16, 2015
3f1beda
Fix submodule_wd submodule remote URLs
dahlbyk May 16, 2015
3feeb01
Add sm_branch_only in a dev branch
dahlbyk Jan 11, 2014
cbea359
Add test for sm_branch_only
dahlbyk Jan 11, 2014
ae134fd
And in .git/config
dahlbyk Jan 11, 2014
b482aca
And in .git/modules
dahlbyk Jan 11, 2014
7c81d05
Ignore extra test resource files
dahlbyk May 16, 2015
0445aaa
Remove extra test resource files
dahlbyk May 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions LibGit2Sharp.Tests/Resources/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
* binary
.gitattributes diff
.gitignore diff
config diff
5 changes: 5 additions & 0 deletions LibGit2Sharp.Tests/Resources/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
*.sample
COMMIT_EDITMSG
exclude
logs/
!testrepo_wd/dot_git/logs/
description
1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/HEAD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/assume_unchanged_wd/dot_git/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/description
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/HEAD
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/conflicts
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/fast_forward
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/normal_merge
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/logs/refs/heads/rename_source
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/HEAD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_small_wd/dot_git/description
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/description
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/HEAD
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/description
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/info/exclude
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/HEAD
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion ...it2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/description
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...t2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/info/exclude
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/HEAD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...sts/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...ources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/HEAD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref: refs/heads/master
16 changes: 16 additions & 0 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file added LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/index
View file
Open in desktop
Binary file not shown.
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1
View file
Open in desktop
Binary file not shown.
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484
View file
Open in desktop
Binary file not shown.
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5
View file
Open in desktop
Binary file not shown.
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/41/bd4bc3df978de695f67ace64c560913da11653
View file
Open in desktop
Binary file not shown.
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/48/0095882d281ed676fe5b863569520e54a7d5c0
View file
Open in desktop
Binary file not shown.
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/5e/4963595a9774b90524d35a807169049de8ccad
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...odule_wd/dot_git/modules/sm_branch_only/objects/6b/31c659545507c381e9cd34ec508f16c04e149e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/73/ba924a80437097795ae839e66e187c55d3babf
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...odule_wd/dot_git/modules/sm_branch_only/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
x-�1�0 Fa����0p�����(N-����ӡғ���q]>ks�*�? |m“���i�@�����m��V����'��`)�.�-1� x
u�x��t(+
2 changes: 2 additions & 0 deletions ...odule_wd/dot_git/modules/sm_branch_only/objects/78/9efbdadaa4a582778d4584385495559ea0994b
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
x���0 �)��?=���N�lO�k���j����8&�����r�
�qJW�7��B<����f��K8�#Q1C-�"e��̫����>�'@
Expand Down
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e
View file
Open in desktop
Binary file not shown.
Binary file added ...odule_wd/dot_git/modules/sm_branch_only/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/packed-refs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
1 change: 1 addition & 0 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/heads/master
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
480095882d281ed676fe5b863569520e54a7d5c0
1 change: 1 addition & 0 deletions ...harp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/remotes/origin/HEAD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref: refs/remotes/origin/master
2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/description
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/info/exclude
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/HEAD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...ests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/remotes/origin/HEAD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/COMMIT_EDITMSG
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/description
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/info/exclude
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/HEAD
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...ests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/remotes/origin/HEAD
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/description
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/info/exclude
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/HEAD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...harp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...sts/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/remotes/origin/HEAD
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion ...2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/description
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/info/exclude
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...it2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/HEAD
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...s/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/heads/master
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...rces/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading