8000 Merge pull request #1051 from libgit2/gh604 · thatfrankdev/libgit2sharp@9d3fe4d · GitHub
[go: up one dir, main page]
Skip to content

Commit 9d3fe4d

Browse files
nulltokennulltoken
committed
Merge pull request libgit2#1051 from libgit2/gh604
Test coverage for branch-only submodule
2 parents 0e3b9f8 + 0445aaa commit 9d3fe4d

File tree

99 files changed

+76
-161
lines changed
  • remotes/origin
  • sm_unchanged
  • objects
  • refs/heads
  • not_submodule/dot_git
  • testrepo_wd/dot_git
  • SubmoduleFixture.cs

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    99 files changed

    +76
    -161
    lines changed

    ‎LibGit2Sharp.Tests/Resources/.gitattributes

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1 +1,4 @@
    11
    * binary
    2+
    .gitattributes diff
    3+
    .gitignore diff
    4+
    config diff

    ‎LibGit2Sharp.Tests/Resources/.gitignore

    Lines changed: 5 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1 +1,6 @@
    11
    *.sample
    2+
    COMMIT_EDITMSG
    3+
    exclude
    4+
    logs/
    5+
    !testrepo_wd/dot_git/logs/
    6+
    description

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

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

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

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/merge_testrepo_wd/dot_git/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

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

    Lines changed: 0 additions & 9 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 2 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 2 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 2 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 2 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 3 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 2 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

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

    Lines changed: 0 additions & 15 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 4 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 4 deletions
    This file was deleted.

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

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/mergerenames_wd/dot_git/logs/refs/heads/master

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_small_wd/dot_git/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/HEAD

    Lines changed: 0 additions & 4 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_target_wd/dot_git/logs/refs/heads/master

    Lines changed: 0 additions & 4 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/config

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -18,3 +18,5 @@
    1818
    url = ../submodule_target_wd
    1919
    [submodule "sm_added_and_uncommited"]
    2020
    url = ../submodule_target_wd
    21+
    [submodule "sm_branch_only"]
    22+
    url = ../submodule_target_wd

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/info/exclude

    Lines changed: 0 additions & 6 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/HEAD

    Lines changed: 0 additions & 4 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/logs/refs/heads/master

    Lines changed: 0 additions & 4 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/config

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    ignorecase = true
    88
    [remote "origin"]
    99
    fetch = +refs/heads/*:refs/remotes/origin/*
    10-
    url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
    10+
    url = ../../../../submodule_target_wd
    1111
    [branch "master"]
    1212
    remote = origin
    1313
    merge = refs/heads/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/info/exclude

    Lines changed: 0 additions & 6 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/heads/master

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/HEAD

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1 @@
    1+
    ref: refs/heads/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/config

    Lines changed: 16 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,16 @@
    1+
    [core]
    2+
    repositoryformatversion = 0
    3+
    filemode = false
    4+
    bare = false
    5+
    logallrefupdates = true
    6+
    worktree = ../../../sm_branch_only
    7+
    symlinks = false
    8+
    ignorecase = true
    9+
    hideDotFiles = dotGitOnly
    10+
    [remote "origin"]
    11+
    url = ../../../../submodule_target_wd
    12+
    fetch = +refs/heads/*:refs/remotes/origin/*
    13+
    [branch "master"]
    14+
    remote = origin
    15+
    merge = refs/heads/master
    16+
    rebase = true

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/index

    192 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1

    55 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484

    53 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5

    93 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/41/bd4bc3df978de695f67ace64c560913da11653

    163 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/48/0095882d281ed676fe5b863569520e54a7d5c0

    163 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/5e/4963595a9774b90524d35a807169049de8ccad

    167 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/6b/31c659545507c381e9cd34ec508f16c04e149e

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,2 @@
    1+
    x��Q
    2+
    !E�vo��y*�_��@�g#h���Oh�^�9w�����Sòf1*���[������Ic Ԥ���p���k� Α\���S߇�l��@.��^�QpF�(�:��D�5��zr~ �en8

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/73/ba924a80437097795ae839e66e187c55d3babf

    93 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,2 @@
    1+
    x-�1�0 Fa����0p�����(N-����ӡғ���q]>ks�*�? |m“���i�@�����m��V����'��`)�.�-1� x
    2+
    u�x��t(+

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/78/9efbdadaa4a582778d4584385495559ea0994b

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,2 @@
    1+
    x���0 �)��?=���N�lO�k���j����8&�����r�
    2+
    �qJW�7��B<����f��K8�#Q1C-�"e��̫����>�'@

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e

    81 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5

    93 Bytes
    Binary file not shown.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/packed-refs

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,2 @@
    1+
    # pack-refs with: peeled fully-peeled
    2+
    480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/heads/master

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1 @@
    1+
    480095882d281ed676fe5b863569520e54a7d5c0

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_branch_only/refs/remotes/origin/HEAD

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1 @@
    1+
    ref: refs/remotes/origin/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/config

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    ignorecase = true
    88
    [remote "origin"]
    99
    fetch = +refs/heads/*:refs/remotes/origin/*
    10-
    url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
    10+
    url = ../../../../submodule_target_wd
    1111
    [branch "master"]
    1212
    remote = origin
    1313
    merge = refs/heads/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/info/exclude

    Lines changed: 0 additions & 6 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/heads/master

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_file/logs/refs/remotes/origin/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/COMMIT_EDITMSG

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/config

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    ignorecase = true
    88
    [remote "origin"]
    99
    fetch = +refs/heads/*:refs/remotes/origin/*
    10-
    url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
    10+
    url = ../../../../submodule_target_wd
    1111
    [branch "master"]
    1212
    remote = origin
    1313
    merge = refs/heads/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/info/exclude

    Lines changed: 0 additions & 6 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/HEAD

    Lines changed: 0 additions & 2 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/heads/master

    Lines changed: 0 additions & 2 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_head/logs/refs/remotes/origin/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/config

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    ignorecase = true
    88
    [remote "origin"]
    99
    fetch = +refs/heads/*:refs/remotes/origin/*
    10-
    url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
    10+
    url = ../../../../submodule_target_wd
    1111
    [branch "master"]
    1212
    remote = origin
    1313
    merge = refs/heads/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/info/exclude

    Lines changed: 0 additions & 6 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/heads/master

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_index/logs/refs/remotes/origin/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/config

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    ignorecase = true
    88
    [remote "origin"]
    99
    fetch = +refs/heads/*:refs/remotes/origin/*
    10-
    url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
    10+
    url = ../../../../submodule_target_wd
    1111
    [branch "master"]
    1212
    remote = origin
    1313
    merge = refs/heads/master

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/description

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/info/exclude

    Lines changed: 0 additions & 6 deletions
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/heads/master

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD

    Lines changed: 0 additions & 1 deletion
    This file was deleted.

    ‎LibGit2Sharp.Tests/Resources/submodule_wd/dot_git/modules/sm_missing_commits/config

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    ignorecase = true
    88
    [remote "origin"]
    99
    fetch = +refs/heads/*:refs/remotes/origin/*
    10-
    url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target
    10+
    url = ../../../../submodule_target_wd
    1111
    [branch "master"]
    1212
    remote = origin
    1313
    merge = refs/heads/master

    0 commit comments

    Comments
     (0)
    0