clean-up tailing spaces, traces, writings and shell spellcheck in test

Author: bicschneider

Documentation/gitmodules.adoc

@@ -70,9 +70,10 @@ submodule.<name>.ignore::
 --
 	all;; The submodule will never be considered modified (but will
 	    nonetheless show up in the output of status and commit when it has
-	    been staged). Add `(new commits)` can be overruled using the 
-		`git add --force` similar to ignored files. For `status`, 
-		`update-index`, `diff` and `log`(due to underlaying `diff`)
+	    been staged). Add `(new commits)` can be overruled using the
+		`git add --force <submodule.path>` similar to ignored files. The setting has effect
+		for `status`, `update-index`, `diff` and `log`(due to underlaying
+		 `diff`)
 
 	dirty;; All changes to the submodule's work tree will be ignored, only
 	    committed differences between the `HEAD` of the submodule and its

builtin/add.c

@@ -5,7 +5,6 @@
  */
 
 #include "builtin.h"
-#include "trace.h"
 #include "advice.h"
 #include "config.h"
 #include "environment.h"
@@ -581,7 +580,6 @@ int cmd_add(int argc,
 	if (add_renormalize)
 		exit_status |= renormalize_tracked_files(repo, &pathspec, flags);
 	else
-		trace_printf("DEBUG ignored_too=%d\n", ignored_too);
 		exit_status |= add_files_to_cache(repo, prefix,
 						  &pathspec, ps_matched,
 						  include_sparse, flags, ignored_too);

builtin/checkout.c

@@ -898,7 +898,6 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			 * entries in the index.
 			 */
 
-			printf("adding files to index\n");
 			add_files_to_cache(the_repository, NULL, NULL, NULL, 0,
 					   0, 0 );
 			init_ui_merge_options(&o, the_repository);

builtin/commit.c

@@ -454,7 +454,6 @@ static const char *prepare_index(const char **argv, const char *prefix,
 		char *ps_matched = xcalloc(pathspec.nr, 1);
 		repo_hold_locked_index(the_repository, &index_lock,
 				       LOCK_DIE_ON_ERROR);
-		printf("commit.c adding files to index\n");
 		add_files_to_cache(the_repository, also ? prefix : NULL,
 				   &pathspec, ps_matched, 0, 0, 0 );
 		if (!all && report_path_error(ps_matched, &pathspec))

read-cache.c

@@ -3959,8 +3959,8 @@ static void update_callback(struct diff_queue_struct *q,
 					if (data->ignored_too && data->ignored_too > 0) {
 						trace_printf("Forcing add of submodule ignored=all due to --force: %s\n", path);
 					} else {
-						printf("Skipping submodule due to ignore=all: %s\n", path);
-						printf("  Use -f|--force if you really want to add the update to the index.\n");
+						printf(_("Skipping submodule due to ignore=all: %s"), path);
+						printf(_("Use -f if you really want to add them.") );
 						continue;
 					}
 				} else {
@@ -3994,6 +3994,7 @@ int add_files_to_cache(struct repository *repo, const char *prefix,
 {
 	struct update_callback_data data;
 	struct rev_info rev;
+
 	memset(&data, 0, sizeof(data));
 	data.repo = repo;
 	data.index = repo->index;
@@ -4002,7 +4003,6 @@ int add_files_to_cache(struct repository *repo, const char *prefix,
 	data.ignored_too = ignored_too;
 	data.pathspec = (struct pathspec *)pathspec;
 
-
 	repo_init_revisions(repo, &rev, prefix);
 	setup_revisions(0, NULL, &rev, NULL);
 	if (pathspec) {

t/t2206-add-submodule-ignored.sh

@@ -1,12 +1,16 @@
 #!/bin/sh
+# shellcheck disable=SC2016
 
+
+# shellcheck disable=SC2034
 test_description='git add respects submodule ignore=all and explicit pathspec'
 
 # This test covers the behavior of "git add", "git status" and "git log" when
 # dealing with submodules that have the ignore=all setting in
 # .gitmodules. It ensures that changes in such submodules are
 # ignored by default, but can be staged with "git add --force".
 
+# shellcheck disable=SC1091
 . ./test-lib.sh
 
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main