| Message ID | 20190402183505.31512-5-kyle@kyleam.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dir: Treat a repository without commits as a repository | expand |
Kyle Meyer <kyle@kyleam.com> writes: > 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, > but we might as well treat anything that looks like a repository > consistently. Makes sense. > 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 Hmph, why should we have the initial "warning" with hint? Shouldn't the above result in an outright error? Something like: $ git add repo ;# or git add repo/ error: repo does not have a commit checked out fatal: adding files failed because the entire purpose of "git add repo" (or "git add repo/") when "repo" is a repository is to register the commit that is checked out in that sub-repository to the index of the top-level repository, as part of updating (or starting) a submodule. I very much like the direction these four patches want to take us. I just have small troubles here and there in their execution, though ;-) Thanks.
Junio C Hamano <gitster@pobox.com> writes: > Kyle Meyer <kyle@kyleam.com> writes: >> 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 > > Hmph, why should we have the initial "warning" with hint? Shouldn't > the above result in an outright error? Something like: > > $ git add repo ;# or git add repo/ > error: repo does not have a commit checked out > fatal: adding files failed > > because the entire purpose of "git add repo" (or "git add repo/") when > "repo" is a repository is to register the commit that is checked out > in that sub-repository to the index of the top-level repository, as > part of updating (or starting) a submodule. Right, the hint makes no sense here. I'll look into adjusting the output to be appropriate. As a minor note: I believe your "git add repo/" comments above describe what should be and not what currently is. The trailing slash results in adding the content from the specified repository to the current repository rather than registering the repository as a submodule: $ git --version git version 2.21.0 $ git init $ git init a $ git -C a commit --allow-empty -mmsg $ touch a/f $ git add a/ $ git status -s A a/f This behavior (and fixing it) was discussed at https://public-inbox.org/git/20180618111919.GA10085@book.hvoigt.net
diff --git a/dir.c b/dir.c index b2cabadf25..a4e59eb351 100644 --- a/dir.c +++ b/dir.c @@ -1467,9 +1467,11 @@ static enum path_treatment treat_directory(struct dir_struct *dir, return path_none; } if (!(dir->flags & DIR_NO_GITLINKS)) { - struct object_id oid; - if (resolve_gitlink_ref(dirname, "HEAD", &oid) == 0) + struct strbuf sb = STRBUF_INIT; + strbuf_addstr(&sb, dirname); + if (is_nonbare_repository_dir(&sb)) return exclude ? path_excluded : path_untracked; + strbuf_release(&sb); } return path_recurse; } diff --git a/t/t3009-ls-files-others-nonsubmodule.sh b/t/t3009-ls-files-others-nonsubmodule.sh index 9ed75928aa..be4e7e26bc 100755 --- a/t/t3009-ls-files-others-nonsubmodule.sh +++ b/t/t3009-ls-files-others-nonsubmodule.sh @@ -8,6 +8,14 @@ This test runs git ls-files --others with the following working tree: directory with no files aside from a bogus .git file repo-bogus-untracked-file/ directory with a bogus .git file and another untracked file + repo-no-commit-no-files/ + git repository without a commit or a file + repo-no-commit-untracked-file/ + git repository without a commit but with an untracked file + repo-with-commit-no-files/ + 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 @@ -17,6 +25,10 @@ test_expect_success 'setup: expected output' ' 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 ' @@ -25,7 +37,15 @@ test_expect_success 'setup: directories' ' 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 && + git init repo-no-commit-no-files && + git init repo-no-commit-untracked-file && + : >repo-no-commit-untracked-file/untracked && + git init repo-with-commit-no-files && + git -C repo-with-commit-no-files commit --allow-empty -mmsg && + 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' ' diff --git a/t/t3700-add.sh b/t/t3700-add.sh index be582a513b..5a8425962b 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -396,6 +396,7 @@ test_expect_success 'no file status change if no pathspec is given in subdir' ' ' test_expect_success 'all statuses changed in folder if . is given' ' + rm -fr empty && git add --chmod=+x . && test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 && git add --chmod=-x . &&
When treat_directory() encounters a directory that is not in the index and DIR_NO_GITLINKS is unset, it calls resolve_gitlink_ref() to decide if a directory looks like a repository, in which case the directory won't be traversed. As a result, 'status -uall' and 'ls-files -o' 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 commands above list untracked files within the repository rather than showing only the top-level directory. 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, but we might as well treat anything that looks like a repository 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. 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. Signed-off-by: Kyle Meyer <kyle@kyleam.com> --- dir.c | 6 ++++-- t/t3009-ls-files-others-nonsubmodule.sh | 22 +++++++++++++++++++++- t/t3700-add.sh | 1 + 3 files changed, 26 insertions(+), 3 deletions(-)