On 5/10/22 1:15 PM, Goss Geppert wrote:
> Since 8d92fb2927 (dir: replace exponential algorithm with a linear one,
> 2020-04-01) the following no longer works:
>
> 1) Initialize a repository.
> 2) Set the `core.worktree` location to a parent directory of the
> default worktree.
> 3) Add a file located in the default worktree location to the index
> (i.e. anywhere in the immediate parent directory of the gitdir).
>
> This commit adds a check to determine whether a nested repository that
> is encountered in recursing a path is actually `the_repository`. If so,
> simply treat the directory as if it doesn't contain a nested repository.
>
> Prior to this commit, the `add` operation was silently ignored.
>
> Signed-off-by: Goss Geppert <ggossdev@xxxxxxxxx>
> ---
> dir.c | 22 +++++++++
> t/t2205-add-worktree-config.sh | 89 ++++++++++++++++++++++++++++++++++
> 2 files changed, 111 insertions(+)
> create mode 100755 t/t2205-add-worktree-config.sh
>
> diff --git a/dir.c b/dir.c
> index f2b0f24210..a1886e61a3 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1893,9 +1893,31 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
>
> if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
> !(dir->flags & DIR_NO_GITLINKS)) {
> + /*
> + * Determine if `dirname` is a nested repo by confirming that:
> + * 1) we are in a nonbare repository, and
> + * 2) `dirname` is not an immediate parent of `the_repository->gitdir`,
> + * which could occur if the `worktree` location was manually
> + * configured by the user; see t2205 testcases 1a-1d for examples
> + * where this matters
> + */
> struct strbuf sb = STRBUF_INIT;
> strbuf_addstr(&sb, dirname);
> nested_repo = is_nonbare_repository_dir(&sb);
> +
> + if (nested_repo) {
> + char *real_dirname, *real_gitdir;
> + strbuf_reset(&sb);
> + strbuf_addstr(&sb, dirname);
> + strbuf_complete(&sb, '/');
> + strbuf_addstr(&sb, ".git");
This could be strbuf_add(&sb, ".git", 4); to avoid a (minor)
strlen() computation.
> + real_dirname = real_pathdup(sb.buf, 0);
> + real_gitdir = real_pathdup(the_repository->gitdir, 0);
With regards to Junio's comment about repeating real_pathdup()
on the_repository->gitdir, we might be able to short-circuit
this by making real_gitdir static and only calling
real_pathdup() if real_gitdir is NULL. It would cut the cost
of these checks by half for big traversals.
> +
> + nested_repo = !!strcmp(real_dirname, real_gitdir);
> + free(real_gitdir);
> + free(real_dirname);
> + }
...
> +
> +test_description='directory traversal respects worktree config
> +
> +This test configures the repository`s worktree to be two levels above the
> +`.git` directory and checks whether we are able to add to the index those files
> +that are in either (1) the manually configured worktree directory or (2) the
> +standard worktree location with respect to the `.git` directory (i.e. ensuring
> +that the encountered `.git` directory is not treated as belonging to a foreign
> +nested repository)'
The test description should be a single line. The longer paragraph
could be a comment before your "setup" test case.
> +. ./test-lib.sh
> +
> +test_expect_success '1a: setup' '
Also, there is no need to number your tests in their names, as the
testing infrastructure will apply numbers based on their order in
the test file. These labels will grow stale if tests are removed
or inserted into the order.
> + test_create_repo test1 &&
> + git --git-dir="test1/.git" config core.worktree "$(pwd)" &&
> +
> + mkdir -p outside-tracked outside-untracked &&
> + mkdir -p test1/inside-tracked test1/inside-untracked &&
> + >file-tracked &&
> + >file-untracked &&
> + >outside-tracked/file &&
> + >outside-untracked/file &&
> + >test1/file-tracked &&
> + >test1/file-untracked &&
> + >test1/inside-tracked/file &&
> + >test1/inside-untracked/file &&
> +
> + cat >expect-tracked-unsorted <<-EOF &&
> + ../file-tracked
> + ../outside-tracked/file
> + file-tracked
> + inside-tracked/file
> + EOF
> +
> + cat >expect-untracked-unsorted <<-EOF &&
> + ../file-untracked
> + ../outside-untracked/file
> + file-untracked
> + inside-untracked/file
> + EOF
> +
> + cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
> +
> + cat >.gitignore <<-EOF
> + .gitignore
> + actual-*
> + expect-*
> + EOF
This use of .gitignore to ignore the helper files being used
during the test is interesting. I was thinking it would be better
to create isolated directories where the only activity was that
which you were testing:
mkdir -p worktree &&
test_create_repo worktree/contains-git &&
...or something like that. The names are more descriptive, and
we don't need the .gitignore trick.
> +'
> +
> +test_expect_success '1b: pre-add all' '
> + local parent_dir="$(pwd)" &&
I was surprised by this "local". It isn't needed at this
point in the test script. We use it for helper methods to
be sure that we aren't stomping variables from test scripts,
but since the test is being executed inside an eval(), this
local isn't important.
> + (
> + cd test1 &&
> + git ls-files -o --exclude-standard "$parent_dir" >../actual-all-unsorted
You can avoid the sub-shell using "git -C test1 ls-files ..."
right?
> + ) &&
> + sort actual-all-unsorted >actual-all &&
> + sort expect-all-unsorted >expect-all &&
> + test_cmp expect-all actual-all
> +'
> +
> +test_expect_success '1c: post-add tracked' '
> + local parent_dir="$(pwd)" &&
> + (
> + cd test1 &&
> + git add file-tracked &&
> + git add inside-tracked &&
> + git add ../outside-tracked &&
> + git add "$parent_dir/file-tracked" &&
> + git ls-files "$parent_dir" >../actual-tracked-unsorted
> + ) &&
This sub-shell is important because of the relative paths
involved. OK.
This also checks to see if _any_ of these "git add"
commands fail, as opposed to failing immediately after
the first one fails. I think your approach is simpler and
should be relatively simple to identify which command did
the wrong thing by looking at the test_cmp output.
> + sort actual-tracked-unsorted >actual-tracked &&
> + sort expect-tracked-unsorted >expect-tracked &&
> + test_cmp expect-tracked actual-tracked
> +'
> +
> +test_expect_success '1d: post-add untracked' '
> + local parent_dir="$(pwd)" &&
> + (
> + cd test1 &&
> + git ls-files -o --exclude-standard "$parent_dir" >../actual-untracked-unsorted
> + ) &&
Again, this one is not needed.
> + sort actual-untracked-unsorted >actual-untracked &&
> + sort expect-untracked-unsorted >expect-untracked &&
> + test_cmp expect-untracked actual-untracked
> +'
> +
Thanks,
-Stolee
