From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <johannes.sixt@telecom.at>, git@vger.kernel.org
Subject: [PATCH 2/2] format-patch: add --reviewed-by=<ident>
Date: Thu, 6 Mar 2008 02:15:24 +0100 (CET) [thread overview]
Message-ID: <alpine.LSU.1.00.0803060214520.15786@racer.site> (raw)
In-Reply-To: <alpine.LSU.1.00.0803052327570.15786@racer.site>
Now you can conveniently add lines with format-patch, adding missing
Reviewed-by: lines (if it is already present at the end of the commit
message, it will not be repeated).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
And this is the actual patch...
It is just a patch for format-patch... the patch for git-am should
be trivial.
Documentation/git-format-patch.txt | 5 ++++
builtin-log.c | 9 +++++++
log-tree.c | 44 +++++++++++++++++++++++++++++++++++-
revision.h | 1 +
t/t4014-format-patch.sh | 26 +++++++++++++++++++++
5 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index b5207b7..da52720 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -11,6 +11,7 @@ SYNOPSIS
[verse]
'git-format-patch' [-k] [-o <dir> | --stdout] [--thread]
[--attach[=<boundary>] | --inline[=<boundary>]]
+ [--reviewed-by=<ident>]
[-s | --signoff] [<common diff options>]
[-n | --numbered | -N | --no-numbered]
[--start-number <n>] [--numbered-files]
@@ -96,6 +97,10 @@ include::diff-options.txt[]
Do not strip/add '[PATCH]' from the first line of the
commit log message.
+--reviewed-by=<ident>::
+ Add `Reviewed-by:` line to the commit message, using
+ the given identity.
+
-s|--signoff::
Add `Signed-off-by:` line to the commit message, using
the committer identity of yourself.
diff --git a/builtin-log.c b/builtin-log.c
index fe8fc6f..90573b3 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -753,6 +753,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
const char *in_reply_to = NULL;
struct patch_ids ids;
char *add_signoff = NULL;
+ struct path_list add_reviewed_by = { NULL, 0, 0, 0 };
struct strbuf buf;
git_config(git_format_config);
@@ -821,6 +822,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
die("bogos committer info %s\n", committer);
add_signoff = xmemdupz(committer, endpos - committer + 1);
}
+ else if (!prefixcmp(argv[i], "--reviewed-by=")) {
+ struct strbuf buf;
+
+ strbuf_initf(&buf, "Reviewed-by: %s", argv[i] + 14);
+ path_list_append(strbuf_detach(&buf, NULL),
+ &add_reviewed_by);
+ }
else if (!strcmp(argv[i], "--attach")) {
rev.mime_boundary = git_version_string;
rev.no_inline = 1;
@@ -994,6 +1002,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
start_number--;
}
rev.add_signoff = add_signoff;
+ rev.add_reviewed_by = &add_reviewed_by;
while (0 <= --nr) {
int shown;
commit = list[nr];
diff --git a/log-tree.c b/log-tree.c
index 608f697..36621ab 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -3,6 +3,7 @@
#include "commit.h"
#include "log-tree.h"
#include "reflog-walk.h"
+#include "path-list.h"
struct decoration name_decoration = { "object names" };
@@ -79,6 +80,34 @@ static int detect_any_signoff(char *letter, int size)
return seen_head && seen_name;
}
+static void append_reviewed_by(struct strbuf *sb, struct path_list *reviewed)
+{
+ struct path_list already_reviewed = { NULL, 0, 0, 0 };
+ int i, eol = sb->len + 1;
+
+ /* find the last Reviewed-by: lines */
+ for (i = eol - 2; i > 0; i--)
+ if (i == 0 || sb->buf[i - 1] == '\n') {
+ if (!prefixcmp(sb->buf + i, "Reviewed-by:"))
+ path_list_insert(xstrndup(sb->buf + i,
+ eol - i - 1),
+ &already_reviewed);
+ else if (eol - i > 1)
+ break;
+ eol = i;
+ }
+
+ for (i = 0; i < reviewed->nr; i++) {
+ const char *line = reviewed->items[i].path;
+ if (!path_list_has_path(&already_reviewed, line))
+ strbuf_addf(sb, "%s\n", line);
+ }
+
+ /* all strings were xstrndup()ed, clean them up */
+ already_reviewed.strdup_paths = 1;
+ path_list_clear(&already_reviewed, 0);
+}
+
static void append_signoff(struct strbuf *sb, const char *signoff)
{
static const char signed_off_by[] = "Signed-off-by: ";
@@ -137,6 +166,16 @@ static int has_non_ascii(const char *s)
return 0;
}
+static int path_list_has_non_ascii(struct path_list *list)
+{
+ int i;
+
+ for (i = 0; list && i < list->nr; i++)
+ if (has_non_ascii(list->items[i].path))
+ return 1;
+ return 0;
+}
+
void log_write_email_headers(struct rev_info *opt, const char *name,
const char **subject_p, const char **extra_headers_p)
{
@@ -301,8 +340,11 @@ void show_log(struct rev_info *opt, const char *sep)
strbuf_init(&msgbuf, 0);
pretty_print_commit(opt->commit_format, commit, &msgbuf,
abbrev, subject, extra_headers, opt->date_mode,
- has_non_ascii(opt->add_signoff));
+ has_non_ascii(opt->add_signoff) ||
+ path_list_has_non_ascii(opt->add_reviewed_by));
+ if (opt->add_reviewed_by && opt->add_reviewed_by->nr)
+ append_reviewed_by(&msgbuf, opt->add_reviewed_by);
if (opt->add_signoff)
append_signoff(&msgbuf, opt->add_signoff);
if (opt->show_log_size)
diff --git a/revision.h b/revision.h
index c8b3b94..eb4cc3b 100644
--- a/revision.h
+++ b/revision.h
@@ -78,6 +78,7 @@ struct rev_info {
char *message_id;
const char *ref_message_id;
const char *add_signoff;
+ struct path_list *add_reviewed_by;
const char *extra_headers;
const char *log_reencode;
const char *subject_prefix;
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index b2b7a8d..e2ff94f 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -230,4 +230,30 @@ test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
'
+cat > expect << EOF
+
+Reviewed-by: Ken Robinson
+
+Reviewed-by: Sergey Rachmaninov
+
+Reviewed-by: Ronny O Sullivan
+Reviewed-by: Mickey Mouse
+Reviewed-by: Mahatma Gandhi
+EOF
+
+test_expect_success '--reviewed-by' '
+
+ echo reviewed > foo &&
+ test_tick &&
+ git commit -m "Reviewed" -m "Reviewed-by: Ken Robinson" \
+ -m "Reviewed-by: Sergey Rachmaninov" \
+ -m "Reviewed-by: Ronny O Sullivan" foo &&
+ git format-patch --reviewed-by="Mickey Mouse" \
+ --reviewed-by="Sergey Rachmaninov" \
+ --reviewed-by="Mahatma Gandhi" -1 HEAD &&
+ sed -e "1,/^Cc: /d" -e "/^---/,\$d" < 0001-Reviewed.patch > output &&
+ git diff expect output
+
+'
+
test_done
--
1.5.4.3.571.g9aec3
next prev parent reply other threads:[~2008-03-06 1:17 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-27 18:54 [PATCH 00/40] MinGW port Johannes Sixt
2008-02-27 18:54 ` [PATCH 01/40] Add compat/regex.[ch] and compat/fnmatch.[ch] Johannes Sixt
2008-02-27 23:43 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 02/40] Compile some programs only conditionally Johannes Sixt
2008-02-28 11:57 ` Johannes Schindelin
2008-02-28 20:30 ` Johannes Sixt
2008-02-29 0:47 ` Johannes Schindelin
2008-02-29 20:58 ` Johannes Sixt
2008-02-29 21:53 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 03/40] Add target architecture MinGW Johannes Sixt
2008-02-28 12:05 ` Johannes Schindelin
2008-02-28 12:57 ` Paolo Bonzini
2008-02-28 14:56 ` Johannes Schindelin
2008-02-28 20:40 ` Johannes Sixt
2008-02-29 1:07 ` Johannes Schindelin
2008-02-29 21:03 ` Johannes Sixt
2008-02-29 21:54 ` Johannes Schindelin
2008-03-05 21:21 ` Johannes Sixt
2008-03-05 22:18 ` Johannes Schindelin
2008-03-05 22:22 ` Junio C Hamano
2008-03-05 22:28 ` Johannes Schindelin
2008-03-05 22:51 ` Junio C Hamano
2008-03-06 0:11 ` Johannes Schindelin
2008-03-06 1:14 ` [PATCH 1/2] Add strbuf_initf() Johannes Schindelin
2008-03-06 6:33 ` Mike Hommey
2008-03-06 9:03 ` Reece Dunn
2008-03-06 10:55 ` Johannes Schindelin
2008-03-06 11:53 ` Reece Dunn
2008-03-06 12:52 ` Johannes Schindelin
2008-03-06 16:29 ` [PATCH 1/2 v2] Add strbuf_vaddf(), use it in strbuf_addf(), and add strbuf_initf() Johannes Schindelin
2008-03-06 16:38 ` Johannes Sixt
2008-03-06 16:47 ` Johannes Sixt
2008-03-06 16:59 ` Johannes Schindelin
2008-03-06 18:18 ` [PATCH 1/2] Add strbuf_initf() Kristian Høgsberg
2008-03-06 18:26 ` Johannes Schindelin
2008-03-06 18:35 ` Kristian Høgsberg
2008-03-06 19:10 ` Mike Hommey
2008-03-06 10:53 ` Johannes Schindelin
2008-03-06 12:09 ` Jeff King
2008-03-06 1:15 ` Johannes Schindelin [this message]
2008-03-06 2:40 ` [PATCH 2/2] format-patch: add --reviewed-by=<ident> Junio C Hamano
2008-03-06 10:40 ` Johannes Schindelin
2008-03-06 20:38 ` [PATCH 03/40] Add target architecture MinGW Johannes Sixt
2008-03-11 21:30 ` Johannes Sixt
2008-03-11 23:28 ` Johannes Schindelin
2008-03-12 22:59 ` Johannes Sixt
2008-03-12 23:06 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 04/40] Windows: Use the Windows style PATH separator ';' Johannes Sixt
2008-02-28 9:25 ` Paolo Bonzini
2008-02-28 20:43 ` Johannes Sixt
2008-02-29 1:09 ` Johannes Schindelin
2008-02-29 7:57 ` Paolo Bonzini
2008-02-29 12:19 ` Johannes Schindelin
2008-02-29 12:45 ` Paolo Bonzini
2008-02-29 12:59 ` Johannes Schindelin
2008-02-28 17:57 ` Junio C Hamano
2008-02-27 18:54 ` [PATCH 05/40] Windows: Strip ".exe" from the program name Johannes Sixt
2008-02-27 18:54 ` [PATCH 06/40] Windows: Implement a wrapper of the open() function Johannes Sixt
2008-02-27 18:54 ` [PATCH 07/40] Windows: A minimal implemention of getpwuid() Johannes Sixt
2008-02-27 18:54 ` [PATCH 08/40] Windows: always chmod(, 0666) before unlink() Johannes Sixt
2008-02-28 12:09 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 09/40] Windows: Work around misbehaved rename() Johannes Sixt
2008-02-27 18:54 ` [PATCH 10/40] Windows: Treat Windows style path names Johannes Sixt
2008-02-28 12:18 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 11/40] Windows: Handle absolute paths in safe_create_leading_directories() Johannes Sixt
2008-02-27 18:54 ` [PATCH 12/40] Windows: Implement gettimeofday() Johannes Sixt
2008-02-27 18:54 ` [PATCH 13/40] Windows: Fix PRIuMAX definition Johannes Sixt
2008-02-28 12:21 ` Johannes Schindelin
2008-02-28 20:45 ` Johannes Sixt
2008-02-27 18:54 ` [PATCH 14/40] Windows: Implement setitimer() and sigaction() Johannes Sixt
2008-02-27 18:54 ` [PATCH 15/40] Windows: A work-around for a misbehaved vsnprintf Johannes Sixt
2008-02-27 18:54 ` [PATCH 16/40] Windows: Wrap execve so that shell scripts can be invoked Johannes Sixt
2008-02-27 18:54 ` [PATCH 17/40] Windows: A pipe() replacement whose ends are not inherited to children Johannes Sixt
2008-02-27 18:54 ` [PATCH 18/40] Windows: Implement start_command() Johannes Sixt
2008-02-27 18:54 ` [PATCH 19/40] Windows: Change the name of hook scripts to make them not executable Johannes Sixt
2008-02-28 15:20 ` Johannes Schindelin
2008-02-28 20:48 ` Johannes Sixt
2008-02-29 1:11 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 20/40] Windows: A rudimentary poll() emulation Johannes Sixt
2008-02-28 9:36 ` Paolo Bonzini
2008-02-28 20:49 ` Johannes Sixt
[not found] ` <5d46db230802282019o21f9ed9fo75fed8744625289e@mail.gmail.com>
[not found] ` <200802292216.25014.johannes.sixt@telecom.at>
2008-02-29 21:47 ` Govind Salinas
2008-02-29 22:16 ` Johannes Sixt
2008-02-29 23:17 ` Brian Dessent
2008-03-01 15:48 ` Robin Rosenberg
2008-03-01 19:24 ` Johannes Sixt
2008-02-27 18:54 ` [PATCH 21/40] Windows: Disambiguate DOS style paths from SSH URLs Johannes Sixt
2008-02-28 15:22 ` Johannes Schindelin
2008-02-28 20:51 ` Johannes Sixt
2008-02-27 18:54 ` [PATCH 22/40] Windows: Implement asynchronous functions as threads Johannes Sixt
2008-02-28 15:28 ` Johannes Schindelin
2008-02-28 17:48 ` Paul Franz
2008-02-29 1:27 ` Johannes Schindelin
2008-02-29 1:46 ` Paul Franz
2008-02-29 1:54 ` Johannes Schindelin
2008-02-29 3:08 ` Paul Franz
2008-02-29 7:51 ` Junio C Hamano
2008-02-29 11:45 ` Paul Franz
2008-02-29 10:26 ` Johannes Schindelin
2008-02-28 21:01 ` Johannes Sixt
2008-02-29 1:17 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 23/40] Windows: Local clone must use the drive letter in absolute paths Johannes Sixt
2008-02-28 15:31 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 24/40] Windows: Work around incompatible sort and find Johannes Sixt
2008-02-27 18:54 ` [PATCH 25/40] Windows: Implement a cpio emulation in git-clone.sh Johannes Sixt
2008-02-27 18:54 ` [PATCH 26/40] Windows: Implement wrappers for gethostbyname(), socket(), and connect() Johannes Sixt
2008-02-27 18:54 ` [PATCH 27/40] Windows: Implement a custom spawnve() Johannes Sixt
2008-02-28 15:36 ` Johannes Schindelin
2008-02-28 21:04 ` Johannes Sixt
2008-02-29 1:18 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 28/40] Windows: Add a new lstat and fstat implementation based on Win32 API Johannes Sixt
2008-02-27 18:54 ` [PATCH 29/40] Windows: Use a customized struct stat that also has the st_blocks member Johannes Sixt
2008-02-27 18:54 ` [PATCH 30/40] Turn builtin_exec_path into a function Johannes Sixt
2008-02-27 18:54 ` [PATCH 31/40] Compute the ultimate fallback for exec_path from the program invocation Johannes Sixt
2008-02-27 18:54 ` [PATCH 32/40] Windows: Use a relative default template_dir and ETC_GITCONFIG Johannes Sixt
2008-02-27 18:54 ` [PATCH 33/40] When installing, be prepared that template_dir may be relative Johannes Sixt
2008-02-28 9:49 ` Paolo Bonzini
2008-02-28 15:45 ` Johannes Schindelin
2008-02-28 15:57 ` Paolo Bonzini
2008-02-28 21:12 ` Johannes Sixt
2008-02-29 1:21 ` Johannes Schindelin
2008-02-27 18:54 ` [PATCH 34/40] Windows: Make the pager work Johannes Sixt
2008-02-27 18:54 ` [PATCH 35/40] Windows: Work around an oddity when a pipe with no reader is written to Johannes Sixt
2008-02-27 18:54 ` [PATCH 36/40] Avoid the "dup dance" in wt_status_print_verbose() when possible Johannes Sixt
2008-02-28 15:48 ` Johannes Schindelin
2008-02-27 18:55 ` [PATCH 37/40] Windows: Make 'git help -a' work Johannes Sixt
2008-02-28 9:52 ` Paolo Bonzini
2008-02-27 18:55 ` [PATCH 38/40] Windows: TMP and TEMP environment variables specify a temporary directory Johannes Sixt
2008-02-27 18:55 ` [PATCH 39/40] Windows: Fix ntohl() related warnings about printf formatting Johannes Sixt
2008-02-27 18:55 ` [PATCH 40/40] compat/pread.c: Add foward decl to fix warning Johannes Sixt
2008-02-28 15:51 ` Johannes Schindelin
2008-02-27 22:01 ` [PATCH 00/40] MinGW port Marius Storm-Olsen
2008-02-27 23:34 ` Martin Langhoff
2008-02-28 3:38 ` Nguyen Thai Ngoc Duy
2008-02-27 23:58 ` Johannes Schindelin
2008-03-02 21:20 ` Johannes Sixt
2008-03-02 22:07 ` Johannes Schindelin
2008-03-03 18:34 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LSU.1.00.0803060214520.15786@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.sixt@telecom.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).