Instead of including USE_THE_REPOSITORY_VARIABLE by default on every builtin, remove it from builtin.h and add it to all the builtins that include builtin.h (by definition, that means all builtins/*.c). Also, remove the include statement for repository.h since it gets brought in through builtin.h. The next step will be to migrate each builtin from having to use the_repository. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			32 lines
		
	
	
		
			757 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			32 lines
		
	
	
		
			757 B
		
	
	
	
		
			C
		
	
	
	
	
	
#define USE_THE_REPOSITORY_VARIABLE
 | 
						|
#include "builtin.h"
 | 
						|
#include "config.h"
 | 
						|
#include "gettext.h"
 | 
						|
#include "parse-options.h"
 | 
						|
#include "server-info.h"
 | 
						|
 | 
						|
static const char * const update_server_info_usage[] = {
 | 
						|
	"git update-server-info [-f | --force]",
 | 
						|
	NULL
 | 
						|
};
 | 
						|
 | 
						|
int cmd_update_server_info(int argc,
 | 
						|
			   const char **argv,
 | 
						|
			   const char *prefix,
 | 
						|
			   struct repository *repo UNUSED)
 | 
						|
{
 | 
						|
	int force = 0;
 | 
						|
	struct option options[] = {
 | 
						|
		OPT__FORCE(&force, N_("update the info files from scratch"), 0),
 | 
						|
		OPT_END()
 | 
						|
	};
 | 
						|
 | 
						|
	git_config(git_default_config, NULL);
 | 
						|
	argc = parse_options(argc, argv, prefix, options,
 | 
						|
			     update_server_info_usage, 0);
 | 
						|
	if (argc > 0)
 | 
						|
		usage_with_options(update_server_info_usage, options);
 | 
						|
 | 
						|
	return !!update_server_info(force);
 | 
						|
}
 |