add --force for adding submodule even ignore=all is set

Author: bicschneider

builtin/add.c

@@ -5,6 +5,7 @@
  */
 
 #include "builtin.h"
+#include "trace.h"
 #include "advice.h"
 #include "config.h"
 #include "environment.h"
@@ -580,9 +581,10 @@ 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);
+						  include_sparse, flags, ignored_too);
 
 	if (take_worktree_changes && !add_renormalize && !ignore_add_errors &&
 	    report_path_error(ps_matched, &pathspec))

builtin/checkout.c

@@ -898,8 +898,9 @@ 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, 0 );
 			init_ui_merge_options(&o, the_repository);
 			o.verbosity = 0;
 			work = write_in_core_index_as_tree(the_repository);

builtin/commit.c

@@ -454,8 +454,9 @@ 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);
+				   &pathspec, ps_matched, 0, 0, 0 );
 		if (!all && report_path_error(ps_matched, &pathspec))
 			exit(128);
 

read-cache-ll.h

@@ -481,7 +481,7 @@ int cmp_cache_name_compare(const void *a_, const void *b_);
 
 int add_files_to_cache(struct repository *repo, const char *prefix,
 		       const struct pathspec *pathspec, char *ps_matched,
-		       int include_sparse, int flags);
+		       int include_sparse, int flags, int ignored_too );
 
 void overlay_tree_on_index(struct index_state *istate,
 			   const char *tree_name, const char *prefix);

read-cache.c

@@ -3885,6 +3885,7 @@ struct update_callback_data {
 	struct index_state *index;
 	int include_sparse;
 	int flags;
+	int ignored_too;
 	int add_errors;
 };
 
@@ -3930,9 +3931,25 @@ static void update_callback(struct diff_queue_struct *q,
 			const struct submodule *sub = submodule_from_path(data->repo, NULL, path);
 			if (sub) {
 				if ( sub->ignore ) {
-					fprintf(stderr, "GIT_TRACE: Skipping submodule with ignore NOT NULL: %s\n", path);
+					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;
 					}
 				}
@@ -3957,7 +3974,7 @@ static void update_callback(struct diff_queue_struct *q,
 
 int add_files_to_cache(struct repository *repo, const char *prefix,
 		       const struct pathspec *pathspec, char *ps_matched,
-		       int include_sparse, int flags)
+		       int include_sparse, int flags, int ignored_too )
 {
 	struct update_callback_data data;
 	struct rev_info rev;
@@ -3966,6 +3983,8 @@ int add_files_to_cache(struct repository *repo, const char *prefix,
 	data.index = repo->index;
 	data.include_sparse = include_sparse;
 	data.flags = flags;
+	trace_printf("DEBUG ignored_too=%d\n", ignored_too);
+	data.ignored_too = ignored_too;
 
 	repo_init_revisions(repo, &rev, prefix);
 	setup_revisions(0, NULL, &rev, NULL);