Teach fmt-patch about --keep-subject
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin committed
May 5, 2006 at 04:31 UTC
8ac80a5701780547404523a84f4b1ae67bfa6823
2 files changed
+16
-5
builtin-log.c
+12
-4
@@ -78,7 +78,7 @@ static int istitlechar(char c)
78
static FILE *realstdout = NULL;
79
static char *output_directory = NULL;
80
81
-static void reopen_stdout(struct commit *commit, int nr)
81
+static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
82
{
83
char filename[1024];
84
char *sol;
@@ -100,7 +100,7 @@ static void reopen_stdout(struct commit *commit, int nr)
100
101
sol += 2;
102
/* strip [PATCH] or [PATCH blabla] */
103
- if (!strncmp(sol, "[PATCH", 6)) {
103
+ if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
104
char *eos = strchr(sol + 6, ']');
105
if (eos) {
106
while (isspace(*eos))
@@ -138,6 +138,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
138
int nr = 0, total, i, j;
139
int use_stdout = 0;
140
int numbered = 0;
141
+ int keep_subject = 0;
142
143
init_revisions(&rev);
144
rev.commit_format = CMIT_FMT_EMAIL;
@@ -160,7 +161,11 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
161
else if (!strcmp(argv[i], "-n") ||
162
!strcmp(argv[i], "--numbered"))
163
numbered = 1;
163
- else if (!strcmp(argv[i], "-o")) {
164
+ else if (!strcmp(argv[i], "-k") ||
165
+ !strcmp(argv[i], "--keep-subject")) {
166
+ keep_subject = 1;
167
+ rev.total = -1;
168
+ } else if (!strcmp(argv[i], "-o")) {
169
if (argc < 3)
170
die ("Which directory?");
171
if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
@@ -173,6 +178,9 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
178
}
179
argc = j;
180
181
+ if (numbered && keep_subject < 0)
182
+ die ("-n and -k are mutually exclusive.");
183
+
184
argc = setup_revisions(argc, argv, &rev, "HEAD");
185
if (argc > 1)
186
die ("unrecognized argument: %s", argv[1]);
@@ -197,7 +205,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
205
commit = list[nr];
206
rev.nr = total - nr;
207
if (!use_stdout)
200
- reopen_stdout(commit, rev.nr);
208
+ reopen_stdout(commit, rev.nr, keep_subject);
209
shown = log_tree_commit(&rev, commit);
210
free(commit->buffer);
211
commit->buffer = NULL;
log-tree.c
+4
-1
@@ -46,8 +46,11 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
46
"Subject: [PATCH %d/%d] ",
47
opt->nr, opt->total);
48
subject = buffer;
49
- } else
49
+ } else if (opt->total == 0)
50
subject = "Subject: [PATCH] ";
51
+ else
52
+ subject = "Subject: ";
53
+
54
printf("From %s Thu Apr 7 15:13:13 2005\n",
55
sha1_to_hex(commit->object.sha1));
56
} else {