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 v4 08/17] trailer: add interpret-trailers command
Date: Thu, 30 Jan 2014 07:49:11 +0100	[thread overview]
Message-ID: <20140130064921.7504.75845.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140130064217.7504.473.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.201.gacc5987

  parent reply	other threads:[~2014-01-30  7:38 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-30  6:49 [PATCH v4 00/17] Add interpret-trailers builtin Christian Couder
2014-01-30  6:49 ` [PATCH v4 01/17] Add data structures and basic functions for commit trailers Christian Couder
2014-01-30  9:10   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 02/17] trailer: process trailers from file and arguments Christian Couder
2014-01-31  4:02   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 03/17] trailer: read and process config information Christian Couder
2014-01-31 15:43   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 04/17] trailer: process command line trailer arguments Christian Couder
2014-01-31 16:30   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 05/17] strbuf: add strbuf_isspace() Christian Couder
2014-01-31  2:51   ` Eric Sunshine
2014-01-31  3:09   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 06/17] trailer: parse trailers from input file Christian Couder
2014-01-31 16:45   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 07/17] trailer: put all the processing together and print Christian Couder
2014-01-30  6:49 ` Christian Couder [this message]
2014-01-31 16:10   ` [PATCH v4 08/17] trailer: add interpret-trailers command Eric Sunshine
2014-02-06 20:12     ` Christian Couder
2014-01-30  6:49 ` [PATCH v4 09/17] trailer: add tests for "git interpret-trailers" Christian Couder
2014-01-30  6:49 ` [PATCH v4 10/17] trailer: if no input file is passed, read from stdin Christian Couder
2014-02-02  9:50   ` Eric Sunshine
2014-02-06 20:16     ` Christian Couder
2014-02-06 21:51   ` Junio C Hamano
2014-02-09 13:55     ` Christian Couder
2014-01-30  6:49 ` [PATCH v4 11/17] trailer: add new_trailer_item() function Christian Couder
2014-02-02 10:10   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 12/17] strbuf: add strbuf_replace() Christian Couder
2014-01-31  3:11   ` Eric Sunshine
2014-01-30  6:49 ` [PATCH v4 13/17] trailer: execute command from 'trailer.<name>.command' Christian Couder
2014-01-30  6:49 ` [PATCH v4 14/17] trailer: add tests for trailer command Christian Couder
2014-01-30  6:49 ` [PATCH v4 15/17] trailer: set author and committer env variables Christian Couder
2014-01-30  6:49 ` [PATCH v4 16/17] trailer: add tests for commands using " Christian Couder
2014-01-30  6:49 ` [PATCH v4 17/17] Documentation: add documentation for 'git interpret-trailers' Christian Couder

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=20140130064921.7504.75845.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).