This is a reroll of <[email protected]>. Thanks,
Junio, for your comments on v2.
The series improves the handling of sub-repositories that don't have a
commit checked out. In particular, it addresses the following issues:
* Calling 'git add repo' is meant to register the repository as a
submodule, but, for a sub-repository that doesn't have a commit
checked out, it is at best a no-op. If the sub-repository has any
untracked files, they are added as blobs in the top-level
repository.
Instead error in this situation.
* 'git submodule add' calls 'git add' on a sub-repository, so it has
the same issues as above. Plus it modifies .gitmodules even
though there is no sub-project OID to register.
Instead error in this situation.
* Commands like 'ls-files -o' and 'status -uall' usually stop
traversing at sub-repository boundaries, but they don't if the
sub-repository doesn't have a commit checked out.
Instead stop traversing at a sub-repository even if it doesn't
have a commit checked out.
Main changes from v2:
* Leave be the "non-submodule .git" test from
t3000-ls-files-others.sh rather than confusingly using it as the
basis for the new t3009-ls-files-others-nonsubmodule.sh
(<[email protected]>).
* Drop unneeded setup function in test (<[email protected]>).
* Provide appropriate output for the 'git add repo-no-commits'
failure (<[email protected]>).
Other changes from v2:
* Commit message tweaks. These include replacing wording like "no
commits" with something like "no commit checked out" because,
technically, this series also concerns repositories that have
commit objects but are on an unborn branch.
* Change the "git submodule add" error message to match the wording
of the new error message added in add_to_index().
* Consistently use "expect" rather than "expected" as the output
file name for expected test output.
Kyle Meyer (3):
submodule: refuse to add repository with no commits
dir: do not traverse repositories with no commits
add: error appropriately on repository with no commits
builtin/add.c | 3 +-
dir.c | 6 ++-
git-submodule.sh | 7 ++++
read-cache.c | 3 ++
t/t3009-ls-files-others-nonsubmodule.sh | 50 +++++++++++++++++++++++++
t/t3700-add.sh | 12 ++++++
t/t7400-submodule-basic.sh | 11 +++++-
7 files changed, 88 insertions(+), 4 deletions(-)
create mode 100755 t/t3009-ls-files-others-nonsubmodule.sh
Range-diff against v2:
1: b080e2c557 ! 1: ad1b0b44e8 submodule: refuse to add repository with no
commits
@@ -4,14 +4,16 @@
When the path given to 'git submodule add' is an existing repository
that is not in the index, the repository is passed to 'git add'. If
- this repository doesn't have any commits, we don't get a useful
- result: there is no subproject OID to track, and any untracked files
- in the sub-repository are added to the current repository.
+ this repository doesn't have a commit checked out, we don't get a
+ useful result: there is no subproject OID to track, and any untracked
+ files in the sub-repository are added as blobs in the top-level
+ repository.
- Detect if the path is a repository with no commits and abort to avoid
- getting into this state. Note that this check must come before the
- 'git add --dry-run' check because an upcoming commit will make 'git
- add' fail in this situation.
+ To avoid getting into this state, abort if the path is a repository
+ that doesn't have a commit checked out. Note that this check must
+ come before the 'git add --dry-run' check because the next commit will
+ make 'git add' fail when given a repository that doesn't have a commit
+ checked out.
Signed-off-by: Kyle Meyer <[email protected]>
@@ -26,7 +28,7 @@
+ test -z $(git -C "$sm_path" rev-parse --show-cdup 2>/dev/null)
+ then
+ git -C "$sm_path" rev-parse --verify -q HEAD >/dev/null ||
-+ die "$(eval_gettext "'\$sm_path' does not have any commits")"
++ die "$(eval_gettext "'\$sm_path' does not have a commit checked
out")"
+ fi
+
if test -z "$force" &&
@@ -41,12 +43,12 @@
'
+test_expect_success 'add aborts on repository with no commits' '
-+ cat >expected <<-\EOF &&
-+ '"'repo-no-commits'"' does not have any commits
++ cat >expect <<-\EOF &&
++ '"'repo-no-commits'"' does not have a commit checked out
+ EOF
+ git init repo-no-commits &&
+ test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
-+ test_i18ncmp expected actual
++ test_i18ncmp expect actual
+'
+
test_expect_success 'setup - repository in init subdirectory' '
2: c027701842 < -: ---------- t3000: move non-submodule repo test to separate
file
3: 97f53e30c0 < -: ---------- t3009: test that ls-files -o traverses bogus
repo
4: a926b87102 ! 2: 1bf762bbd3 dir: do not traverse repositories with no
commits
@@ -9,12 +9,15 @@
will show only the directory, even when there are untracked files
within the directory.
- For the unusual case where a repository doesn't have any commits,
- resolve_gitlink_ref() returns -1 because HEAD cannot be resolved, and
- the directory is treated as a normal directory (i.e. traversal does
- not stop at the repository boundary). The status and ls-files
+ For the unusual case where a repository doesn't have a commit checked
+ out, resolve_gitlink_ref() returns -1 because HEAD cannot be resolved,
+ and the directory is treated as a normal directory (i.e. traversal
+ does not stop at the repository boundary). The status and ls-files
commands above list untracked files within the repository rather than
- showing only the top-level directory.
+ showing only the top-level directory. And if 'git add' is called on a
+ repository with no commit checked out, any untracked files under the
+ repository are added as blobs in the top-level project, a behavior
+ that is unlikely to be what the caller intended.
The above case is a corner case in an already unusual situation of the
working tree containing a repository that is not a tracked submodule,
@@ -22,23 +25,12 @@
consistently. Loosen the "looks like a repository" criteria in
treat_directory() by replacing resolve_gitlink_ref() with
is_nonbare_repository_dir(), one of the checks that is performed
- downstream when resolve_gitlink_ref() is called with an empty
- repository.
+ downstream when resolve_gitlink_ref() is called.
- As the required update to t3700-add shows, being looser with the check
- means that we're stricter when adding empty repositories to the index:
-
- % git add repo
- warning: adding embedded git repository: repo
- hint: You've added another git repository inside your current
repository.
- hint: [...]
- error: unable to index file 'repo/'
- fatal: adding files failed
-
- That error message isn't particularly helpful in this situation, but
- it seems preferable to the old behavior of adding the repository's
- untracked files. And if the caller really wants the previous
- behavior, they can get it by adding a trailing slash.
+ As the required update to t3700-add shows, calling 'git add' on a
+ repository with no commit checked out will now raise an error. While
+ this is the desired behavior, note that the output isn't yet
+ appropriate. The next commit will improve this output.
Signed-off-by: Kyle Meyer <[email protected]>
@@ -61,12 +53,20 @@
}
diff --git a/t/t3009-ls-files-others-nonsubmodule.sh
b/t/t3009-ls-files-others-nonsubmodule.sh
- --- a/t/t3009-ls-files-others-nonsubmodule.sh
+ new file mode 100755
+ --- /dev/null
+++ b/t/t3009-ls-files-others-nonsubmodule.sh
@@
- directory with no files aside from a bogus .git file
- repo-bogus-untracked-file/
- directory with a bogus .git file and another untracked file
++#!/bin/sh
++
++test_description='test git ls-files --others with non-submodule
repositories
++
++This test runs git ls-files --others with the following working tree:
++
++ nonrepo-no-files/
++ plain directory with no files
++ nonrepo-untracked-file/
++ plain directory with an untracked file
+ repo-no-commit-no-files/
+ git repository without a commit or a file
+ repo-no-commit-untracked-file/
@@ -75,26 +75,14 @@
+ git repository with a commit and no untracked files
+ repo-with-commit-untracked-file/
+ git repository with a commit and an untracked file
- '
-
- . ./test-lib.sh
-@@
- expected
- output
- repo-bogus-untracked-file/untracked
-+ repo-no-commit-no-files/
-+ repo-no-commit-untracked-file/
-+ repo-with-commit-no-files/
-+ repo-with-commit-untracked-file/
- EOF
- '
-
-@@
- echo foo >repo-bogus-no-files/.git &&
- mkdir repo-bogus-untracked-file &&
- echo foo >repo-bogus-untracked-file/.git &&
-- : >repo-bogus-untracked-file/untracked
-+ : >repo-bogus-untracked-file/untracked &&
++'
++
++. ./test-lib.sh
++
++test_expect_success 'setup: directories' '
++ mkdir nonrepo-no-files/ &&
++ mkdir nonrepo-untracked-file &&
++ : >nonrepo-untracked-file/untracked &&
+ git init repo-no-commit-no-files &&
+ git init repo-no-commit-untracked-file &&
+ : >repo-no-commit-untracked-file/untracked &&
@@ -103,9 +91,22 @@
+ git init repo-with-commit-untracked-file &&
+ test_commit -C repo-with-commit-untracked-file msg &&
+ : >repo-with-commit-untracked-file/untracked
- '
-
- test_expect_success 'ls-files --others handles non-submodule .git' '
++'
++
++test_expect_success 'ls-files --others handles untracked git
repositories' '
++ git ls-files -o >output &&
++ cat >expect <<-EOF &&
++ nonrepo-untracked-file/untracked
++ output
++ repo-no-commit-no-files/
++ repo-no-commit-untracked-file/
++ repo-with-commit-no-files/
++ repo-with-commit-untracked-file/
++ EOF
++ test_cmp expect output
++'
++
++test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
--- a/t/t3700-add.sh
-: ---------- > 3: a2f9af5448 add: error appropriately on repository with no
commits
--
2.21.0
