make "mktag" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Torvalds committed
Jan 22, 2010 at 07:34 UTC
112dd5146589ecb76d52bf349bd51dbe2936e936
4 files changed
+4
-6
Makefile
+1
-1
@@ -389,7 +389,6 @@ PROGRAMS += $(EXTRA_PROGRAMS)
389
PROGRAMS += git-fast-import$X
390
PROGRAMS += git-imap-send$X
391
PROGRAMS += git-index-pack$X
392
-PROGRAMS += git-mktag$X
392
PROGRAMS += git-pack-redundant$X
393
PROGRAMS += git-shell$X
394
PROGRAMS += git-show-index$X
@@ -670,6 +669,7 @@ BUILTIN_OBJS += builtin-merge-index.o
669
BUILTIN_OBJS += builtin-merge-ours.o
670
BUILTIN_OBJS += builtin-merge-recursive.o
671
BUILTIN_OBJS += builtin-merge-tree.o
672
+BUILTIN_OBJS += builtin-mktag.o
673
BUILTIN_OBJS += builtin-mktree.o
674
BUILTIN_OBJS += builtin-mv.o
675
BUILTIN_OBJS += builtin-name-rev.o
builtin-mktag.c
renamed
+1
-5
@@ -153,7 +153,7 @@ static int verify_tag(char *buffer, unsigned long size)
153
154
#undef PD_FMT
155
156
-int main(int argc, char **argv)
156
+int cmd_mktag(int argc, const char **argv, const char *prefix)
157
{
158
struct strbuf buf = STRBUF_INIT;
159
unsigned char result_sha1[20];
@@ -161,10 +161,6 @@ int main(int argc, char **argv)
161
if (argc != 1)
162
usage("git mktag < signaturefile");
163
164
- git_extract_argv0_path(argv[0]);
165
-
166
- setup_git_directory();
167
-
164
if (strbuf_read(&buf, 0, 4096) < 0) {
165
die_errno("could not read from stdin");
166
}
builtin.h
+1
@@ -73,6 +73,7 @@ extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
73
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
74
extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
75
extern int cmd_merge_tree(int argc, const char **argv, const char *prefix);
76
+extern int cmd_mktag(int argc, const char **argv, const char *prefix);
77
extern int cmd_mktree(int argc, const char **argv, const char *prefix);
78
extern int cmd_mv(int argc, const char **argv, const char *prefix);
79
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
git.c
+1
@@ -338,6 +338,7 @@ static void handle_internal_command(int argc, const char **argv)
338
{ "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
339
{ "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
340
{ "merge-tree", cmd_merge_tree, RUN_SETUP },
341
+ { "mktag", cmd_mktag, RUN_SETUP },
342
{ "mktree", cmd_mktree, RUN_SETUP },
343
{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
344
{ "name-rev", cmd_name_rev, RUN_SETUP },