Updated for requested revisions:
* Split patch between fix and clean-up
* Added a test
* Included my sign-off
It wasn't clear to me where the testcases should be placed--let me know
if a different location is more appropriate.
Goss Geppert (2):
dir: consider worktree config in path recursion
dir: minor refactoring / clean-up
dir.c | 38 ++++++++++++---
t/t2205-add-worktree-config.sh | 89 ++++++++++++++++++++++++++++++++++
2 files changed, 120 insertions(+), 7 deletions(-)
create mode 100755 t/t2205-add-worktree-config.sh
Range-diff against v1:
1: b9ca67e61d ! 1: 83bf9f40ac dir: consider worktree config in path recursion
@@ Commit message
Prior to this commit, the `add` operation was silently ignored.
+ Signed-off-by: Goss Geppert <ggossdev@xxxxxxxxx>
+
## dir.c ##
@@ dir.c: static enum path_treatment treat_directory(struct dir_struct *dir,
- */
- enum path_treatment state;
- int matches_how = 0;
-- int nested_repo = 0, check_only, stop_early;
-+ int check_only, stop_early;
- int old_ignored_nr, old_untracked_nr;
- /* The "len-1" is to strip the final '/' */
- enum exist_status status = directory_exists_in_index(istate, dirname, len-1);
-@@ dir.c: static enum path_treatment treat_directory(struct dir_struct *dir,
if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
!(dir->flags & DIR_NO_GITLINKS)) {
@@ dir.c: static enum path_treatment treat_directory(struct dir_struct *dir,
+ * 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
++ * configured by the user; see t2205 testcases 1a-1d for examples
++ * where this matters
+ */
-+ int nested_repo;
struct strbuf sb = STRBUF_INIT;
strbuf_addstr(&sb, dirname);
nested_repo = is_nonbare_repository_dir(&sb);
@@ dir.c: static enum path_treatment treat_directory(struct dir_struct *dir,
+ free(real_dirname);
+ }
strbuf_release(&sb);
-- }
-- if (nested_repo) {
-- if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
-- (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
-- return path_none;
-- return excluded ? path_excluded : path_untracked;
-+
-+ if (nested_repo) {
-+ if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
-+ (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
-+ return path_none;
-+ return excluded ? path_excluded : path_untracked;
-+ }
}
-
- if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) {
+ if (nested_repo) {
+
+ ## t/t2205-add-worktree-config.sh (new) ##
+@@
++#!/bin/sh
++
++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)'
++
++. ./test-lib.sh
++
++test_expect_success '1a: setup' '
++ 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
++'
++
++test_expect_success '1b: pre-add all' '
++ local parent_dir="$(pwd)" &&
++ (
++ cd test1 &&
++ git ls-files -o --exclude-standard "$parent_dir" >../actual-all-unsorted
++ ) &&
++ 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
++ ) &&
++ 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
++ ) &&
++ sort actual-untracked-unsorted >actual-untracked &&
++ sort expect-untracked-unsorted >expect-untracked &&
++ test_cmp expect-untracked actual-untracked
++'
++
++test_done
-: ---------- > 2: 0da9804776 dir: minor refactoring / clean-up
--
2.36.0
