@matheusbsbs / matheus-bagliano / commits / cf2251b604
Fork 0

format-patch --signoff

This resurrects --signoff option to format-patch. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed May 31, 2006 at 15:11 UTC cf2251b60460e651a5e00afe9ef7c427ad296711
3 files changed +52 -2
builtin-log.c
+16 -2
@@ -150,6 +150,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
150 int numbered = 0;
151 int start_number = -1;
152 int keep_subject = 0;
153 + char *add_signoff = NULL;
154
155 init_revisions(&rev);
156 rev.commit_format = CMIT_FMT_EMAIL;
@@ -179,11 +180,13 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
180 if (i == argc)
181 die("Need a number for --start-number");
182 start_number = strtol(argv[i], NULL, 10);
182 - } else if (!strcmp(argv[i], "-k") ||
183 + }
184 + else if (!strcmp(argv[i], "-k") ||
185 !strcmp(argv[i], "--keep-subject")) {
186 keep_subject = 1;
187 rev.total = -1;
186 - } else if (!strcmp(argv[i], "-o")) {
188 + }
189 + else if (!strcmp(argv[i], "-o")) {
190 if (argc < 3)
191 die ("Which directory?");
192 if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
@@ -192,6 +195,16 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
195 output_directory = strdup(argv[i + 1]);
196 i++;
197 }
198 + else if (!strcmp(argv[i], "--signoff") ||
199 + !strcmp(argv[i], "-s")) {
200 + const char *committer = git_committer_info(1);
201 + const char *endpos = strchr(committer, '>');
202 + if (!endpos)
203 + die("bogos committer info %s\n", committer);
204 + add_signoff = xmalloc(endpos - committer + 2);
205 + memcpy(add_signoff, committer, endpos - committer + 1);
206 + add_signoff[endpos - committer + 1] = 0;
207 + }
208 else if (!strcmp(argv[i], "--attach"))
209 rev.mime_boundary = git_version_string;
210 else if (!strncmp(argv[i], "--attach=", 9))
@@ -230,6 +243,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
243 total = nr;
244 if (numbered)
245 rev.total = total + start_number - 1;
246 + rev.add_signoff = add_signoff;
247 while (0 <= --nr) {
248 int shown;
249 commit = list[nr];
log-tree.c
+35
@@ -12,6 +12,37 @@ static void show_parents(struct commit *commit, int abbrev)
12 }
13 }
14
15 +static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
16 +{
17 + int signoff_len = strlen(signoff);
18 + static const char signed_off_by[] = "Signed-off-by: ";
19 + char *cp = buf;
20 +
21 + /* Do we have enough space to add it? */
22 + if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 2)
23 + return at;
24 +
25 + /* First see if we already have the sign-off by the signer */
26 + while (1) {
27 + cp = strstr(cp, signed_off_by);
28 + if (!cp)
29 + break;
30 + cp += strlen(signed_off_by);
31 + if ((cp + signoff_len < buf + at) &&
32 + !strncmp(cp, signoff, signoff_len) &&
33 + isspace(cp[signoff_len]))
34 + return at; /* we already have him */
35 + }
36 +
37 + strcpy(buf + at, signed_off_by);
38 + at += strlen(signed_off_by);
39 + strcpy(buf + at, signoff);
40 + at += signoff_len;
41 + buf[at++] = '\n';
42 + buf[at] = 0;
43 + return at;
44 +}
45 +
46 void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
47 {
48 static char this_header[16384];
@@ -111,6 +142,10 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
142 * And then the pretty-printed message itself
143 */
144 len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, after_subject);
145 +
146 + if (opt->add_signoff)
147 + len = append_signoff(this_header, sizeof(this_header), len,
148 + opt->add_signoff);
149 printf("%s%s%s", this_header, extra, sep);
150 }
151
revision.h
+1
@@ -60,6 +60,7 @@ struct rev_info {
60 struct log_info *loginfo;
61 int nr, total;
62 const char *mime_boundary;
63 + const char *add_signoff;
64
65 /* special limits */
66 int max_count;