create tests for git add of submodule behavior for ignore=all

Author: bicschneider

read-cache.c

@@ -3920,6 +3920,8 @@ static void update_callback(struct diff_queue_struct *q,
 		struct diff_filepair *p = q->queue[i];
 		const char *path = p->one->path;
 
+		trace_printf("File '%s'\n", path);
+
 		if (!data->include_sparse &&
 		    !path_in_sparse_checkout(path, data->index))
 			continue;
@@ -3928,30 +3930,19 @@ static void update_callback(struct diff_queue_struct *q,
 		default:
 			die(_("unexpected diff status %c"), p->status);
 		case DIFF_STATUS_MODIFIED:
-			const struct submodule *sub = submodule_from_path(data->repo, NULL, path);
-			if (sub) {
-				if ( sub->ignore ) {
-					trace_printf("ignore=%s\n", sub->ignore);
-					if (strcmp(sub->ignore, "all") == 0) {
-						trace_printf("ignore=all - test\n");	
-						if ( data->ignored_too ) {
-							trace_printf("ignored_too=%d --force given\n", data->ignored_too);
-							if ( data->ignored_too > 0 ) {
-								trace_printf("Adding submodule even ignore=all is due to --force|-f: %s\n", path);
-							} else {
-								printf("Skipping submodule with ignore=all: %s\n", path);
-								printf("  Use -f if you really want to add them.");
-								continue;
-							}
-						} else {
-							trace_printf("--force not set");
-							continue;
-						}
-					} else {
-						trace_printf("Skipping submodule with ignore=all: %s\n", path);
-						trace_printf("  Use -f if you really want to add them.");
-						continue;
-					}
+			trace_printf("diff modified '%s'\n", path);
+			const struct submodule *sub = submodule_from_path(data->repo, null_oid(the_hash_algo), path);
+			if ( sub && sub->name ) 
+				trace_printf("  submodule %s\n", sub->name);
+			if ( sub && sub->name && sub->ignore && strcmp(sub->ignore, "all") == 0 ) {
+				trace_printf("ignore=all %s\n" , path );	
+				if ( data->ignored_too && data->ignored_too > 0 ) {
+					trace_printf("Adding submodule even ignore=all is due to --force|-f: %s\n", path);
+				} else {
+					trace_printf("Skipping submodule with ignore=all: %s\n", path);
+					trace_printf("  Use -f if you really want to add them.");
+					/* Skip this path (submodule ignored) and move on to next diff pair */
+					continue;
 				}
 			}
 			if (add_file_to_index(data->index, path, data->flags)) {

t/t2206-add-submodule-ignored.sh

@@ -0,0 +1,73 @@
+#!/bin/sh
+
+test_description='git add respects submodule ignore=all and explicit pathspec'
+
+. ./test-lib.sh
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+base_path=$(pwd -P)
+
+#1
+test_expect_success 'setup: create origin repos'  '
+	cd "${base_path}" &&
+	git config --global protocol.file.allow always &&
+	git init sub && 
+		pwd &&
+		cd sub &&
+		test_commit sub_file1 &&
+		git tag v1.0 &&
+		test_commit sub_file2 &&
+		git tag v2.0 &&
+	cd "${base_path}" &&
+	git init main &&
+		cd main &&
+		test_commit first &&
+	cd "${base_path}"
+'
+#2
+test_expect_success 'main: add submodule and config ignore=all'  '
+	cd "${base_path}" &&
+	cd main && 
+	git submodule add ../sub &&
+	git commit -m "add submodule" &&
+	git config -f .gitmodules submodule.sub.ignore all &&
+	git add . &&
+	git commit -m "update submodule config sub.ignore all" &&
+	! git status --porcelain | grep "^.*$" &&
+	echo
+'
+
+#3
+test_expect_success 'sub: change to different sha1 and check status in main'  '
+	cd "${base_path}" &&
+	cd main &&
+	git -C sub reset --hard v1.0 &&
+	! git status --porcelain | grep "^ M sub$" &&
+	git status --ignore-submodules=none --porcelain | grep "^ M sub$" &&
+	echo
+'
+
+#4
+test_expect_success 'main: check normal add and status'  '
+	cd "${base_path}" &&
+	cd main &&
+	git add . &&
+	! git status --porcelain | grep "^ M sub$" &&
+	echo
+'
+
+#5
+test_expect_success 'main: check force add and status'  '
+	cd "${base_path}" &&
+	cd main &&
+	git add --force . &&
+	git status --porcelain | grep "^M  sub$" &&
+	git commit -m "update submodule pointer" &&
+	! git status --porcelain | grep "^ M sub$" &&
+	git log --ignore-submodules=none --name-only --oneline | grep "^sub$" &&
+	echo
+'
+test_done
+exit 0