trailer: add interpret-trailers command

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/.gitignore b/.gitignore
index 5bfb234591a63446d9fccf7665e442f02d1c76b5..347d4ff8c2551b589c92cdbc460aa84aaec67c3e 100644 (file)
--- 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 3cc71159f61901d52bbb7c8f196f741b8e58c182..3495fff5db0f501b6ae7476b5eaf93cb4ea0012d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -828,6 +828,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 5d91f31ca25e0c16fca0e8c23d83706840bf6c57..b87df70f96d0f43e4b838f34d7492d116d4d97db 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -73,6 +73,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 (file)
index 0000000..46838d2
--- /dev/null
+++ b/builtin/interpret-trailers.c
@@ -0,0 +1,44 @@
+/*
+ * Builtin "git interpret-trailers"
+ *
+ * Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
+ *
+ */
+
+#include "cache.h"
+#include "builtin.h"
+#include "parse-options.h"
+#include "string-list.h"
+#include "trailer.h"
+
+static const char * const git_interpret_trailers_usage[] = {
+       N_("git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"),
+       NULL
+};
+
+int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
+{
+       int trim_empty = 0;
+       struct string_list trailers = STRING_LIST_INIT_DUP;
+
+       struct option options[] = {
+               OPT_BOOL(0, "trim-empty", &trim_empty, N_("trim empty trailers")),
+               OPT_STRING_LIST(0, "trailer", &trailers, N_("trailer"),
+                               N_("trailer(s) to add")),
+               OPT_END()
+       };
+
+       argc = parse_options(argc, argv, prefix, options,
+                            git_interpret_trailers_usage, 0);
+
+       if (argc) {
+               int i;
+               for (i = 0; i < argc; i++)
+                       process_trailers(argv[i], trim_empty, &trailers);
+       } else
+               process_trailers(NULL, trim_empty, &trailers);
+
+       string_list_clear(&trailers, 0);
+
+       return 0;
+}

diff --git a/git.c b/git.c
index 210f1ae9d04dda4d16f9f072ef710bf630f6d52e..fac390233c69c5300db4439160f7d8ebea6b7fd2 100644 (file)
--- a/git.c
+++ b/git.c
@@ -418,6 +418,7 @@ static struct cmd_struct commands[] = {
        { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
        { "init", cmd_init_db, NO_SETUP },
        { "init-db", cmd_init_db, NO_SETUP },
+       { "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 },