 b2141fc1d2
			
		
	
	b2141fc1d2
	
	
	
		
			
			Stop including config.h by default in cache.h. Instead only include config.h in those files which require use of the config system. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			96 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			96 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "cache.h"
 | |
| #include "config.h"
 | |
| #include "exec_cmd.h"
 | |
| #include "http.h"
 | |
| #include "walker.h"
 | |
| 
 | |
| static const char http_fetch_usage[] = "git http-fetch "
 | |
| "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url";
 | |
| 
 | |
| int cmd_main(int argc, const char **argv)
 | |
| {
 | |
| 	struct walker *walker;
 | |
| 	int commits_on_stdin = 0;
 | |
| 	int commits;
 | |
| 	const char **write_ref = NULL;
 | |
| 	char **commit_id;
 | |
| 	char *url = NULL;
 | |
| 	int arg = 1;
 | |
| 	int rc = 0;
 | |
| 	int get_tree = 0;
 | |
| 	int get_history = 0;
 | |
| 	int get_all = 0;
 | |
| 	int get_verbosely = 0;
 | |
| 	int get_recover = 0;
 | |
| 
 | |
| 	while (arg < argc && argv[arg][0] == '-') {
 | |
| 		if (argv[arg][1] == 't') {
 | |
| 			get_tree = 1;
 | |
| 		} else if (argv[arg][1] == 'c') {
 | |
| 			get_history = 1;
 | |
| 		} else if (argv[arg][1] == 'a') {
 | |
| 			get_all = 1;
 | |
| 			get_tree = 1;
 | |
| 			get_history = 1;
 | |
| 		} else if (argv[arg][1] == 'v') {
 | |
| 			get_verbosely = 1;
 | |
| 		} else if (argv[arg][1] == 'w') {
 | |
| 			write_ref = &argv[arg + 1];
 | |
| 			arg++;
 | |
| 		} else if (argv[arg][1] == 'h') {
 | |
| 			usage(http_fetch_usage);
 | |
| 		} else if (!strcmp(argv[arg], "--recover")) {
 | |
| 			get_recover = 1;
 | |
| 		} else if (!strcmp(argv[arg], "--stdin")) {
 | |
| 			commits_on_stdin = 1;
 | |
| 		}
 | |
| 		arg++;
 | |
| 	}
 | |
| 	if (argc != arg + 2 - commits_on_stdin)
 | |
| 		usage(http_fetch_usage);
 | |
| 	if (commits_on_stdin) {
 | |
| 		commits = walker_targets_stdin(&commit_id, &write_ref);
 | |
| 	} else {
 | |
| 		commit_id = (char **) &argv[arg++];
 | |
| 		commits = 1;
 | |
| 	}
 | |
| 
 | |
| 	if (get_all == 0)
 | |
| 		warning("http-fetch: use without -a is deprecated.\n"
 | |
| 			"In a future release, -a will become the default.");
 | |
| 
 | |
| 	if (argv[arg])
 | |
| 		str_end_url_with_slash(argv[arg], &url);
 | |
| 
 | |
| 	setup_git_directory();
 | |
| 
 | |
| 	git_config(git_default_config, NULL);
 | |
| 
 | |
| 	http_init(NULL, url, 0);
 | |
| 	walker = get_http_walker(url);
 | |
| 	walker->get_tree = get_tree;
 | |
| 	walker->get_history = get_history;
 | |
| 	walker->get_all = get_all;
 | |
| 	walker->get_verbosely = get_verbosely;
 | |
| 	walker->get_recover = get_recover;
 | |
| 
 | |
| 	rc = walker_fetch(walker, commits, commit_id, write_ref, url);
 | |
| 
 | |
| 	if (commits_on_stdin)
 | |
| 		walker_targets_free(commits, commit_id, write_ref);
 | |
| 
 | |
| 	if (walker->corrupt_object_found) {
 | |
| 		fprintf(stderr,
 | |
| "Some loose object were found to be corrupt, but they might be just\n"
 | |
| "a false '404 Not Found' error message sent with incorrect HTTP\n"
 | |
| "status code.  Suggest running 'git fsck'.\n");
 | |
| 	}
 | |
| 
 | |
| 	walker_free(walker);
 | |
| 	http_cleanup();
 | |
| 
 | |
| 	free(url);
 | |
| 
 | |
| 	return rc;
 | |
| }
 |