git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
	Josh Triplett <josh@joshtriplett.org>,
	Thomas Rast <tr@thomasrast.ch>,
	Michael Haggerty <mhagger@alum.mit.edu>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Greg Kroah-Hartman <greg@kroah.com>, Jeff King <peff@peff.net>
Subject: [PATCH v5 07/14] trailer: add interpret-trailers command
Date: Thu, 06 Feb 2014 21:19:56 +0100	[thread overview]
Message-ID: <20140206202004.325.48784.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140206194123.325.99451.chriscool@tuxfamily.org>

This patch adds the "git interpret-trailers" command.
This command uses the previously added process_trailers()
function in trailer.c.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 .gitignore                   |  1 +
 Makefile                     |  1 +
 builtin.h                    |  1 +
 builtin/interpret-trailers.c | 36 ++++++++++++++++++++++++++++++++++++
 git.c                        |  1 +
 trailer.h                    |  6 ++++++
 6 files changed, 46 insertions(+)
 create mode 100644 builtin/interpret-trailers.c
 create mode 100644 trailer.h

diff --git a/.gitignore b/.gitignore
index b5f9def..c870ada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,7 @@
 /git-index-pack
 /git-init
 /git-init-db
+/git-interpret-trailers
 /git-instaweb
 /git-log
 /git-ls-files
diff --git a/Makefile b/Makefile
index ec90feb..a91465e 100644
--- a/Makefile
+++ b/Makefile
@@ -935,6 +935,7 @@ BUILTIN_OBJS += builtin/hash-object.o
 BUILTIN_OBJS += builtin/help.o
 BUILTIN_OBJS += builtin/index-pack.o
 BUILTIN_OBJS += builtin/init-db.o
+BUILTIN_OBJS += builtin/interpret-trailers.o
 BUILTIN_OBJS += builtin/log.o
 BUILTIN_OBJS += builtin/ls-files.o
 BUILTIN_OBJS += builtin/ls-remote.o
diff --git a/builtin.h b/builtin.h
index d4afbfe..30f4c30 100644
--- a/builtin.h
+++ b/builtin.h
@@ -71,6 +71,7 @@ extern int cmd_hash_object(int argc, const char **argv, const char *prefix);
 extern int cmd_help(int argc, const char **argv, const char *prefix);
 extern int cmd_index_pack(int argc, const char **argv, const char *prefix);
 extern int cmd_init_db(int argc, const char **argv, const char *prefix);
+extern int cmd_interpret_trailers(int argc, const char **argv, const char *prefix);
 extern int cmd_log(int argc, const char **argv, const char *prefix);
 extern int cmd_log_reflog(int argc, const char **argv, const char *prefix);
 extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
new file mode 100644
index 0000000..04b0ae2
--- /dev/null
+++ b/builtin/interpret-trailers.c
@@ -0,0 +1,36 @@
+/*
+ * Builtin "git interpret-trailers"
+ *
+ * Copyright (c) 2013 Christian Couder <chriscool@tuxfamily.org>
+ *
+ */
+
+#include "cache.h"
+#include "builtin.h"
+#include "parse-options.h"
+#include "strbuf.h"
+#include "trailer.h"
+
+static const char * const git_interpret_trailers_usage[] = {
+	N_("git interpret-trailers [--trim-empty] [--infile=<file>] [(<token>[(=|:)<value>])...]"),
+	NULL
+};
+
+int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
+{
+	const char *infile = NULL;
+	int trim_empty = 0;
+
+	struct option options[] = {
+		OPT_BOOL(0, "trim-empty", &trim_empty, N_("trim empty trailers")),
+		OPT_FILENAME(0, "infile", &infile, N_("use message from file")),
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, prefix, options,
+			     git_interpret_trailers_usage, 0);
+
+	process_trailers(infile, trim_empty, argc, argv);
+
+	return 0;
+}
diff --git a/git.c b/git.c
index 3799514..1420b58 100644
--- a/git.c
+++ b/git.c
@@ -383,6 +383,7 @@ static void handle_internal_command(int argc, const char **argv)
 		{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
 		{ "init", cmd_init_db },
 		{ "init-db", cmd_init_db },
+		{ "interpret-trailers", cmd_interpret_trailers, RUN_SETUP },
 		{ "log", cmd_log, RUN_SETUP },
 		{ "ls-files", cmd_ls_files, RUN_SETUP },
 		{ "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY },
diff --git a/trailer.h b/trailer.h
new file mode 100644
index 0000000..9db4459
--- /dev/null
+++ b/trailer.h
@@ -0,0 +1,6 @@
+#ifndef TRAILER_H
+#define TRAILER_H
+
+void process_trailers(const char *infile, int trim_empty, int argc, const char **argv);
+
+#endif /* TRAILER_H */
-- 
1.8.5.2.206.g98f5689.dirty

  parent reply	other threads:[~2014-02-06 20:21 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-06 20:19 [PATCH v5 00/14] Add interpret-trailers builtin Christian Couder
2014-02-06 20:19 ` [PATCH v5 01/14] Add data structures and basic functions for commit trailers Christian Couder
2014-02-06 23:44   ` Junio C Hamano
2014-02-09 13:48     ` Christian Couder
2014-02-10  7:27       ` Eric Sunshine
2014-02-06 23:46   ` Junio C Hamano
2014-02-09 13:51     ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 02/14] trailer: process trailers from file and arguments Christian Couder
2014-02-07  0:03   ` Junio C Hamano
2014-02-09 13:52     ` Christian Couder
2014-02-10 18:14       ` Junio C Hamano
2014-02-10 19:59         ` Christian Couder
2014-02-10 20:51           ` Junio C Hamano
2014-02-11 15:02             ` Christian Couder
2014-02-11 18:07               ` Junio C Hamano
2014-02-14 21:41                 ` Christian Couder
2014-02-14 21:46                   ` Junio C Hamano
2014-02-14 23:29                     ` Christian Couder
2014-02-14 23:39                       ` Junio C Hamano
2014-02-14 23:57                   ` Junio C Hamano
2014-02-15  0:16                     ` Junio C Hamano
2014-02-21  0:22                       ` Junio C Hamano
2014-02-23 10:44                         ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 03/14] trailer: read and process config information Christian Couder
2014-02-06 20:19 ` [PATCH v5 04/14] trailer: process command line trailer arguments Christian Couder
2014-02-07  0:08   ` Junio C Hamano
2014-02-09 14:06     ` Christian Couder
2014-02-06 20:19 ` [PATCH v5 05/14] trailer: parse trailers from input file Christian Couder
2014-02-06 20:19 ` [PATCH v5 06/14] trailer: put all the processing together and print Christian Couder
2014-02-06 20:19 ` Christian Couder [this message]
2014-02-07  0:10   ` [PATCH v5 07/14] trailer: add interpret-trailers command Junio C Hamano
2014-02-07  8:34     ` Christian Couder
2014-02-07 18:09       ` Junio C Hamano
2014-02-07 20:35         ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 08/14] trailer: add tests for "git interpret-trailers" Christian Couder
2014-02-07  0:11   ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 09/14] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-07  0:12   ` Junio C Hamano
2014-02-06 20:19 ` [PATCH v5 10/14] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-02-07  0:18   ` Junio C Hamano
2014-02-07 18:17   ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 11/14] trailer: add tests for trailer command Christian Couder
2014-02-06 20:20 ` [PATCH v5 12/14] trailer: set author and committer env variables Christian Couder
2014-02-07  0:20   ` Junio C Hamano
2014-02-07  0:26   ` Junio C Hamano
2014-02-06 20:20 ` [PATCH v5 13/14] trailer: add tests for commands using " Christian Couder
2014-02-06 20:20 ` [PATCH v5 14/14] Documentation: add documentation for 'git interpret-trailers' Christian Couder
2014-02-10  7:17   ` Eric Sunshine

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140206202004.325.48784.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=dan.carpenter@oracle.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=greg@kroah.com \
    --cc=johan@herland.net \
    --cc=josh@joshtriplett.org \
    --cc=mhagger@alum.mit.edu \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.com \
    --cc=tr@thomasrast.ch \
    /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.
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 NNTP newsgroup(s).