Merge branch 'js/submodule-in-excluded'

gitster · gitster · commit da7996aaf75f · 2017-11-06T13:11:26.000+09:00
"git status --ignored -u" did not stop at a working tree of a
separate project that is embedded in an ignored directory and
listed files in that other project, instead of just showing the
directory itself as ignored.

* js/submodule-in-excluded:
  status: do not get confused by submodules in excluded directories
diff --git a/dir.c b/dir.c
@@ -1392,7 +1392,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
`@@ -1392,7 +1392,7 @@ static enum path_treatment treat_directory(struct dir_struct *dir,`
`1392`	`1392`	`if (!(dir->flags & DIR_NO_GITLINKS)) {`
`1393`	`1393`	`unsigned char sha1[20];`
`1394`	`1394`	`if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)`
`1395`		`- return path_untracked;`
	`1395`	`+ return exclude ? path_excluded : path_untracked;`
`1396`	`1396`	`}`
`1397`	`1397`	`return path_recurse;`
`1398`	`1398`	`}`