 0c7ecb7c31
			
		
	
	0c7ecb7c31
	
	
	
		
			
			Moving a submodule that itself has submodule in it with "git mv"
forgot to make necessary adjustment to the nested sub-submodules;
now the codepath learned to recurse into the submodules.
* sb/submodule-move-nested:
  submodule: fixup nested submodules after moving the submodule
  submodule-config: remove submodule_from_cache
  submodule-config: add repository argument to submodule_from_{name, path}
  submodule-config: allow submodule_free to handle arbitrary repositories
  grep: remove "repo" arg from non-supporting funcs
  submodule.h: drop declaration of connect_work_tree_and_git_dir
		
	
		
			
				
	
	
		
			74 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "test-tool.h"
 | |
| #include "cache.h"
 | |
| #include "config.h"
 | |
| #include "submodule-config.h"
 | |
| #include "submodule.h"
 | |
| 
 | |
| static void die_usage(int argc, const char **argv, const char *msg)
 | |
| {
 | |
| 	fprintf(stderr, "%s\n", msg);
 | |
| 	fprintf(stderr, "Usage: %s [<commit> <submodulepath>] ...\n", argv[0]);
 | |
| 	exit(1);
 | |
| }
 | |
| 
 | |
| int cmd__submodule_config(int argc, const char **argv)
 | |
| {
 | |
| 	const char **arg = argv;
 | |
| 	int my_argc = argc;
 | |
| 	int output_url = 0;
 | |
| 	int lookup_name = 0;
 | |
| 
 | |
| 	arg++;
 | |
| 	my_argc--;
 | |
| 	while (arg[0] && starts_with(arg[0], "--")) {
 | |
| 		if (!strcmp(arg[0], "--url"))
 | |
| 			output_url = 1;
 | |
| 		if (!strcmp(arg[0], "--name"))
 | |
| 			lookup_name = 1;
 | |
| 		arg++;
 | |
| 		my_argc--;
 | |
| 	}
 | |
| 
 | |
| 	if (my_argc % 2 != 0)
 | |
| 		die_usage(argc, argv, "Wrong number of arguments.");
 | |
| 
 | |
| 	setup_git_directory();
 | |
| 
 | |
| 	while (*arg) {
 | |
| 		struct object_id commit_oid;
 | |
| 		const struct submodule *submodule;
 | |
| 		const char *commit;
 | |
| 		const char *path_or_name;
 | |
| 
 | |
| 		commit = arg[0];
 | |
| 		path_or_name = arg[1];
 | |
| 
 | |
| 		if (commit[0] == '\0')
 | |
| 			oidclr(&commit_oid);
 | |
| 		else if (get_oid(commit, &commit_oid) < 0)
 | |
| 			die_usage(argc, argv, "Commit not found.");
 | |
| 
 | |
| 		if (lookup_name) {
 | |
| 			submodule = submodule_from_name(the_repository,
 | |
| 							&commit_oid, path_or_name);
 | |
| 		} else
 | |
| 			submodule = submodule_from_path(the_repository,
 | |
| 							&commit_oid, path_or_name);
 | |
| 		if (!submodule)
 | |
| 			die_usage(argc, argv, "Submodule not found.");
 | |
| 
 | |
| 		if (output_url)
 | |
| 			printf("Submodule url: '%s' for path '%s'\n",
 | |
| 					submodule->url, submodule->path);
 | |
| 		else
 | |
| 			printf("Submodule name: '%s' for path '%s'\n",
 | |
| 					submodule->name, submodule->path);
 | |
| 
 | |
| 		arg += 2;
 | |
| 	}
 | |
| 
 | |
| 	submodule_free(the_repository);
 | |
| 
 | |
| 	return 0;
 | |
| }
 |