X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tools%2Fmailinfo.c;h=a36123a1f5bc27e90debcf19d5348937c738d2f2;hb=10d781b9caa4f71495c7b34963bef137216f86a8;hp=fb2ea2b70bf56c59da34bd90158b929b8ee56caa;hpb=d59a6043a8a7aed97c684fb4f14fe5221df1fcaf;p=git.git

diff --git a/tools/mailinfo.c b/tools/mailinfo.c
index fb2ea2b7..a36123a1 100644
--- a/tools/mailinfo.c
+++ b/tools/mailinfo.c
@@ -9,6 +9,7 @@
 
 static FILE *cmitmsg, *patchfile;
 
+static int keep_subject = 0;
 static char line[1000];
 static char date[1000];
 static char name[1000];
@@ -101,6 +102,8 @@ static void check_line(char *line, int len)
 
 static char * cleanup_subject(char *subject)
 {
+	if (keep_subject)
+		return subject;
 	for (;;) {
 		char *p;
 		int len, remove;
@@ -242,8 +245,20 @@ static void usage(void)
 	exit(1);
 }
 
+static const char mailinfo_usage[] =
+"git-mailinfo [-k] msg patch <mail >info";
 int main(int argc, char ** argv)
 {
+	while (1 < argc && argv[1][0] == '-') {
+		if (!strcmp(argv[1], "-k"))
+			keep_subject = 1;
+		else {
+			fprintf(stderr, "usage: %s\n", mailinfo_usage);
+			exit(1);
+		}
+		argc--; argv++;
+	}
+
 	if (argc != 3)
 		usage();
 	cmitmsg = fopen(argv[1], "w");