diff options
author | Russell Belfer <rb@github.com> | 2013-03-19 04:24:13 +0400 |
---|---|---|
committer | Russell Belfer <rb@github.com> | 2013-03-19 04:24:13 +0400 |
commit | 65025cb8934a289460bc64f82c27027c68a85be6 (patch) | |
tree | 4b945ad28ff220ffa8500275a5e7a635749e3d11 /tests-clar/resources | |
parent | 5b27bf7e5bfd5c2f92a15c0058c801d49faf8403 (diff) |
Three submodule status bug fixes
1. Fix sort order problem with submodules where "mod" was sorting
after "mod-plus" because they were being sorted as "mod/" and
"mod-plus/". This involved pushing the "contains a .git entry"
test significantly lower in the stack.
2. Reinstate behavior that a directory which contains a .git entry
will be treated as a submodule during iteration even if it is
not yet added to the .gitmodules.
3. Now that any directory containing .git is reported as submodule,
we have to be more careful checking for GIT_EEXISTS when we
do a submodule lookup, because that is the error code that is
returned by git_submodule_lookup when you try to look up a
directory containing .git that has no record in gitmodules or
the index.
Diffstat (limited to 'tests-clar/resources')
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/HEAD (renamed from tests-clar/resources/submod2/not_submodule/.gitted/HEAD) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/config (renamed from tests-clar/resources/submod2/not_submodule/.gitted/config) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/description (renamed from tests-clar/resources/submod2/not_submodule/.gitted/description) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/index (renamed from tests-clar/resources/submod2/not_submodule/.gitted/index) | bin | 112 -> 112 bytes | |||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/info/exclude (renamed from tests-clar/resources/submod2/not_submodule/.gitted/info/exclude) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/logs/HEAD (renamed from tests-clar/resources/submod2/not_submodule/.gitted/logs/HEAD) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/logs/refs/heads/master (renamed from tests-clar/resources/submod2/not_submodule/.gitted/logs/refs/heads/master) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 (renamed from tests-clar/resources/submod2/not_submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444) | bin | 132 -> 132 bytes | |||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/objects/71/ff9927d7c8a5639e062c38a7d35c433c424627 (renamed from tests-clar/resources/submod2/not_submodule/.gitted/objects/71/ff9927d7c8a5639e062c38a7d35c433c424627) | bin | 52 -> 52 bytes | |||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/objects/f0/1d56b18efd353ef2bb93a4585d590a0847195e (renamed from tests-clar/resources/submod2/not_submodule/.gitted/objects/f0/1d56b18efd353ef2bb93a4585d590a0847195e) | bin | 55 -> 55 bytes | |||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/.gitted/refs/heads/master (renamed from tests-clar/resources/submod2/not_submodule/.gitted/refs/heads/master) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not-submodule/README.txt (renamed from tests-clar/resources/submod2/not_submodule/README.txt) | 0 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not/.gitted/notempty | 1 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not/README.txt | 1 | ||||
-rw-r--r-- | tests-clar/resources/submod2/not_submodule/.gitted/COMMIT_EDITMSG | 1 |
15 files changed, 2 insertions, 1 deletions
diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/HEAD b/tests-clar/resources/submod2/not-submodule/.gitted/HEAD index cb089cd89..cb089cd89 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/HEAD +++ b/tests-clar/resources/submod2/not-submodule/.gitted/HEAD diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/config b/tests-clar/resources/submod2/not-submodule/.gitted/config index af107929f..af107929f 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/config +++ b/tests-clar/resources/submod2/not-submodule/.gitted/config diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/description b/tests-clar/resources/submod2/not-submodule/.gitted/description index 498b267a8..498b267a8 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/description +++ b/tests-clar/resources/submod2/not-submodule/.gitted/description diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/index b/tests-clar/resources/submod2/not-submodule/.gitted/index Binary files differindex f3fafa536..f3fafa536 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/index +++ b/tests-clar/resources/submod2/not-submodule/.gitted/index diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/info/exclude b/tests-clar/resources/submod2/not-submodule/.gitted/info/exclude index a5196d1be..a5196d1be 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/info/exclude +++ b/tests-clar/resources/submod2/not-submodule/.gitted/info/exclude diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/logs/HEAD b/tests-clar/resources/submod2/not-submodule/.gitted/logs/HEAD index 1749e7dff..1749e7dff 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/logs/HEAD +++ b/tests-clar/resources/submod2/not-submodule/.gitted/logs/HEAD diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/logs/refs/heads/master b/tests-clar/resources/submod2/not-submodule/.gitted/logs/refs/heads/master index 1749e7dff..1749e7dff 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/logs/refs/heads/master +++ b/tests-clar/resources/submod2/not-submodule/.gitted/logs/refs/heads/master diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 b/tests-clar/resources/submod2/not-submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 Binary files differindex 8892531a7..8892531a7 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 +++ b/tests-clar/resources/submod2/not-submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/objects/71/ff9927d7c8a5639e062c38a7d35c433c424627 b/tests-clar/resources/submod2/not-submodule/.gitted/objects/71/ff9927d7c8a5639e062c38a7d35c433c424627 Binary files differindex c4e1a77d7..c4e1a77d7 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/objects/71/ff9927d7c8a5639e062c38a7d35c433c424627 +++ b/tests-clar/resources/submod2/not-submodule/.gitted/objects/71/ff9927d7c8a5639e062c38a7d35c433c424627 diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/objects/f0/1d56b18efd353ef2bb93a4585d590a0847195e b/tests-clar/resources/submod2/not-submodule/.gitted/objects/f0/1d56b18efd353ef2bb93a4585d590a0847195e Binary files differindex e9f1942a9..e9f1942a9 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/objects/f0/1d56b18efd353ef2bb93a4585d590a0847195e +++ b/tests-clar/resources/submod2/not-submodule/.gitted/objects/f0/1d56b18efd353ef2bb93a4585d590a0847195e diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/refs/heads/master b/tests-clar/resources/submod2/not-submodule/.gitted/refs/heads/master index 0bd8514bd..0bd8514bd 100644 --- a/tests-clar/resources/submod2/not_submodule/.gitted/refs/heads/master +++ b/tests-clar/resources/submod2/not-submodule/.gitted/refs/heads/master diff --git a/tests-clar/resources/submod2/not_submodule/README.txt b/tests-clar/resources/submod2/not-submodule/README.txt index 71ff9927d..71ff9927d 100644 --- a/tests-clar/resources/submod2/not_submodule/README.txt +++ b/tests-clar/resources/submod2/not-submodule/README.txt diff --git a/tests-clar/resources/submod2/not/.gitted/notempty b/tests-clar/resources/submod2/not/.gitted/notempty new file mode 100644 index 000000000..9b33ac4e4 --- /dev/null +++ b/tests-clar/resources/submod2/not/.gitted/notempty @@ -0,0 +1 @@ +fooled you diff --git a/tests-clar/resources/submod2/not/README.txt b/tests-clar/resources/submod2/not/README.txt new file mode 100644 index 000000000..4f6935b98 --- /dev/null +++ b/tests-clar/resources/submod2/not/README.txt @@ -0,0 +1 @@ +what am I really diff --git a/tests-clar/resources/submod2/not_submodule/.gitted/COMMIT_EDITMSG b/tests-clar/resources/submod2/not_submodule/.gitted/COMMIT_EDITMSG deleted file mode 100644 index 5852f4463..000000000 --- a/tests-clar/resources/submod2/not_submodule/.gitted/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -Initial commit |