 3f0ec0687d
			
		
	
	3f0ec0687d
	
	
	
		
			
			Since b9605bc4f2 ("config: only read .git/config from configured
repos", 2016-09-12), we do not read from ".git/config" unless we
know we are in a repository.  "git mailinfo" however didn't do the
repository discovery and instead relied on the old behaviour.  This
was mostly OK because it was merely run as a helper program by other
porcelain scripts that first chdir's up to the root of the working
tree.
Teach the command to run a "gentle" version of repository discovery
so that local configuration variables like mailinfo.scissors are
honoured.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
	
		
			
				
	
	
		
			73 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			73 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Another stupid program, this one parsing the headers of an
 | |
|  * email to figure out authorship and subject
 | |
|  */
 | |
| #include "cache.h"
 | |
| #include "builtin.h"
 | |
| #include "utf8.h"
 | |
| #include "strbuf.h"
 | |
| #include "mailinfo.h"
 | |
| 
 | |
| static const char mailinfo_usage[] =
 | |
| 	"git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] <msg> <patch> < mail >info";
 | |
| 
 | |
| static char *prefix_copy(const char *prefix, const char *filename)
 | |
| {
 | |
| 	if (!prefix || is_absolute_path(filename))
 | |
| 		return xstrdup(filename);
 | |
| 	return xstrdup(prefix_filename(prefix, strlen(prefix), filename));
 | |
| }
 | |
| 
 | |
| int cmd_mailinfo(int argc, const char **argv, const char *prefix)
 | |
| {
 | |
| 	const char *def_charset;
 | |
| 	struct mailinfo mi;
 | |
| 	int status;
 | |
| 	char *msgfile, *patchfile;
 | |
| 
 | |
| 	setup_mailinfo(&mi);
 | |
| 
 | |
| 	def_charset = get_commit_output_encoding();
 | |
| 	mi.metainfo_charset = def_charset;
 | |
| 
 | |
| 	while (1 < argc && argv[1][0] == '-') {
 | |
| 		if (!strcmp(argv[1], "-k"))
 | |
| 			mi.keep_subject = 1;
 | |
| 		else if (!strcmp(argv[1], "-b"))
 | |
| 			mi.keep_non_patch_brackets_in_subject = 1;
 | |
| 		else if (!strcmp(argv[1], "-m") || !strcmp(argv[1], "--message-id"))
 | |
| 			mi.add_message_id = 1;
 | |
| 		else if (!strcmp(argv[1], "-u"))
 | |
| 			mi.metainfo_charset = def_charset;
 | |
| 		else if (!strcmp(argv[1], "-n"))
 | |
| 			mi.metainfo_charset = NULL;
 | |
| 		else if (starts_with(argv[1], "--encoding="))
 | |
| 			mi.metainfo_charset = argv[1] + 11;
 | |
| 		else if (!strcmp(argv[1], "--scissors"))
 | |
| 			mi.use_scissors = 1;
 | |
| 		else if (!strcmp(argv[1], "--no-scissors"))
 | |
| 			mi.use_scissors = 0;
 | |
| 		else if (!strcmp(argv[1], "--no-inbody-headers"))
 | |
| 			mi.use_inbody_headers = 0;
 | |
| 		else
 | |
| 			usage(mailinfo_usage);
 | |
| 		argc--; argv++;
 | |
| 	}
 | |
| 
 | |
| 	if (argc != 3)
 | |
| 		usage(mailinfo_usage);
 | |
| 
 | |
| 	mi.input = stdin;
 | |
| 	mi.output = stdout;
 | |
| 
 | |
| 	msgfile = prefix_copy(prefix, argv[1]);
 | |
| 	patchfile = prefix_copy(prefix, argv[2]);
 | |
| 
 | |
| 	status = !!mailinfo(&mi, msgfile, patchfile);
 | |
| 	clear_mailinfo(&mi);
 | |
| 
 | |
| 	free(msgfile);
 | |
| 	free(patchfile);
 | |
| 	return status;
 | |
| }
 |