[PATCH 2/5] Make mktag a builtin.
From: <hidden>
Date: 2016-06-15 22:44:35
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 2/5] Make mktag a builtin. · Brandon Casey <hidden>
- 2016-06-15 · Re: [PATCH 2/5] Make mktag a builtin. · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH 2/5] Make mktag a builtin. · Brandon Casey <hidden>
- 2016-06-15 · Re: [PATCH 2/5] Make mktag a builtin. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 2/5] Make mktag a builtin. · Junio C Hamano <hidden>
From: Brandon Casey <redacted> Signed-off-by: Brandon Casey <redacted> --- Makefile | 3 ++- builtin.h | 1 + git.c | 1 + mktag.c | 4 +--- 4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 9d84c8d..1128cef 100644
--- a/Makefile
+++ b/Makefile@@ -282,7 +282,6 @@ PROGRAMS += git-imap-send$X PROGRAMS += git-index-pack$X PROGRAMS += git-merge-index$X PROGRAMS += git-merge-tree$X -PROGRAMS += git-mktag$X PROGRAMS += git-mktree$X PROGRAMS += git-pack-redundant$X PROGRAMS += git-patch-id$X
@@ -306,6 +305,7 @@ BUILT_INS += git-fsck-objects$X BUILT_INS += git-get-tar-commit-id$X BUILT_INS += git-init$X BUILT_INS += git-merge-subtree$X +BUILT_INS += git-mktag$X BUILT_INS += git-peek-remote$X BUILT_INS += git-repo-config$X BUILT_INS += git-show$X
@@ -423,6 +423,7 @@ LIB_OBJS += log-tree.o LIB_OBJS += mailmap.o LIB_OBJS += match-trees.o LIB_OBJS += merge-file.o +LIB_OBJS += mktag.o LIB_OBJS += object.o LIB_OBJS += pack-check.o LIB_OBJS += pack-revindex.o
diff --git a/builtin.h b/builtin.h
index 95126fd..a8d3a11 100644
--- a/builtin.h
+++ b/builtin.h@@ -58,6 +58,7 @@ extern int cmd_merge_base(int argc, const char **argv, const char *prefix); extern int cmd_merge_ours(int argc, const char **argv, const char *prefix); extern int cmd_merge_file(int argc, const char **argv, const char *prefix); extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix); +extern int cmd_mktag(int argc, const char **argv, const char *prefix); extern int cmd_mv(int argc, const char **argv, const char *prefix); extern int cmd_name_rev(int argc, const char **argv, const char *prefix); extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
diff --git a/git.c b/git.c
index 89b431f..81aa31c 100644
--- a/git.c
+++ b/git.c@@ -325,6 +325,7 @@ static void handle_internal_command(int argc, const char **argv) { "merge-ours", cmd_merge_ours, RUN_SETUP }, { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, + { "mktag", cmd_mktag, RUN_SETUP }, { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, { "name-rev", cmd_name_rev, RUN_SETUP }, { "pack-objects", cmd_pack_objects, RUN_SETUP },
diff --git a/mktag.c b/mktag.c
index 5489ad6..352747b 100644
--- a/mktag.c
+++ b/mktag.c@@ -156,7 +156,7 @@ static int verify_tag(const char *buffer, size_t size) #undef PD_FMT -int main(int argc, char **argv) +int cmd_mktag(int argc, const char **argv, const char *prefix) { struct strbuf buf; unsigned char result_sha1[20];
@@ -164,8 +164,6 @@ int main(int argc, char **argv) if (argc != 1) usage("git-mktag < signaturefile"); - setup_git_directory(); - strbuf_init(&buf, 0); if (strbuf_read(&buf, 0, 4096) < 0) { die("could not read from stdin");
--
1.5.5.67.g9a49