status: do not get confused by submodules in excluded directories

dscho · gitster · commit fadb4820c4a0 · 2017-10-26T11:29:06.000+09:00
We meticulously pass the `exclude` flag to the `treat_directory()`
function so that we can indicate that files in it are excluded rather
than untracked when recursing.

But we did not yet treat submodules the same way.

Because of that, `git status --ignored --untracked` with a submodule
`submodule` in a gitignored `tracked/` would show the submodule in the
"Untracked files" section, e.g.

	On branch master
	Untracked files:
	  (use "git add &lt;file&gt;..." to include in what will be committed)

		tracked/submodule/

	Ignored files:
	  (use "git add -f &lt;file&gt;..." to include in what will be committed)

		tracked/submodule/initial.t

Instead, we would want it to show the submodule in the "Ignored files"
section:

	On branch master
	Ignored files:
	  (use "git add -f &lt;file&gt;..." to include in what will be committed)

		tracked/submodule/

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/dir.c b/dir.c
@@ -1362,7 +1362,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 		if (!(dir->flags & DIR_NO_GITLINKS)) {
 			unsigned char sha1[20];
 			if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)
-				return path_untracked;
+				return exclude ? path_excluded : path_untracked;
 		}
 		return path_recurse;
 	}
diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
@@ -272,4 +272,15 @@ test_expect_success 'status ignored tracked directory with uncommitted file in t
 	test_cmp expected actual
 '
 
+cat >expected <<\EOF
+!! tracked/submodule/
+EOF
+
+test_expect_success 'status ignores submodule in excluded directory' '
+	git init tracked/submodule &&
+	test_commit -C tracked/submodule initial &&
+	git status --porcelain --ignored -u tracked/submodule >actual &&
+	test_cmp expected actual
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -1362,7 +1362,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,`
`1362`	`1362`	`if (!(dir->flags & DIR_NO_GITLINKS)) {`
`1363`	`1363`	`unsigned char sha1[20];`
`1364`	`1364`	`if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)`
`1365`		`- return path_untracked;`
	`1365`	`+ return exclude ? path_excluded : path_untracked;`
`1366`	`1366`	`}`
`1367`	`1367`	`return path_recurse;`
`1368`	`1368`	`}`