X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-log.c;h=71df957eaa0b85bd841fe3758b6efbfd51243881;hb=58c19d1f95f4742efc6b3ca7d2fddbccd015e0b0;hp=1c9f7d02a8746d1d33347b7baaa85e4153a61bbb;hpb=3ddad98b74924d76116d05e7601ab1e163d68500;p=git.git

diff --git a/builtin-log.c b/builtin-log.c
index 1c9f7d02a..71df957ea 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -35,7 +35,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
 		if (!prefixcmp(arg, "--encoding=")) {
 			arg += 11;
 			if (strcmp(arg, "none"))
-				git_log_output_encoding = strdup(arg);
+				git_log_output_encoding = xstrdup(arg);
 			else
 				git_log_output_encoding = "";
 		}
@@ -482,10 +482,22 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			memcpy(add_signoff, committer, endpos - committer + 1);
 			add_signoff[endpos - committer + 1] = 0;
 		}
-		else if (!strcmp(argv[i], "--attach"))
+		else if (!strcmp(argv[i], "--attach")) {
 			rev.mime_boundary = git_version_string;
-		else if (!prefixcmp(argv[i], "--attach="))
+			rev.no_inline = 1;
+		}
+		else if (!prefixcmp(argv[i], "--attach=")) {
+			rev.mime_boundary = argv[i] + 9;
+			rev.no_inline = 1;
+		}
+		else if (!strcmp(argv[i], "--inline")) {
+			rev.mime_boundary = git_version_string;
+			rev.no_inline = 0;
+		}
+		else if (!prefixcmp(argv[i], "--inline=")) {
 			rev.mime_boundary = argv[i] + 9;
+			rev.no_inline = 0;
+		}
 		else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
 			ignore_if_in_upstream = 1;
 		else if (!strcmp(argv[i], "--thread"))