make "merge-index" 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:29 UTC
0ecace728f8e48b87f81433b053d7f277f22e674
4 files changed
+5
-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-merge-index$X
392
PROGRAMS += git-mktag$X
393
PROGRAMS += git-pack-redundant$X
394
PROGRAMS += git-shell$X
@@ -667,6 +666,7 @@ BUILTIN_OBJS += builtin-mailsplit.o
666
BUILTIN_OBJS += builtin-merge.o
667
BUILTIN_OBJS += builtin-merge-base.o
668
BUILTIN_OBJS += builtin-merge-file.o
669
+BUILTIN_OBJS += builtin-merge-index.o
670
BUILTIN_OBJS += builtin-merge-ours.o
671
BUILTIN_OBJS += builtin-merge-recursive.o
672
BUILTIN_OBJS += builtin-merge-tree.o
builtin-merge-index.c
renamed
+2
-5
@@ -66,7 +66,7 @@ static void merge_all(void)
66
}
67
}
68
69
-int main(int argc, char **argv)
69
+int cmd_merge_index(int argc, const char **argv, const char *prefix)
70
{
71
int i, force_file = 0;
72
@@ -78,9 +78,6 @@ int main(int argc, char **argv)
78
if (argc < 3)
79
usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
80
81
- git_extract_argv0_path(argv[0]);
82
-
83
- setup_git_directory();
81
read_cache();
82
83
i = 1;
@@ -94,7 +91,7 @@ int main(int argc, char **argv)
91
}
92
pgm = argv[i++];
93
for (; i < argc; i++) {
97
- char *arg = argv[i];
94
+ const char *arg = argv[i];
95
if (!force_file && *arg == '-') {
96
if (!strcmp(arg, "--")) {
97
force_file = 1;
builtin.h
+1
@@ -68,6 +68,7 @@ extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
68
extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
69
extern int cmd_merge(int argc, const char **argv, const char *prefix);
70
extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
71
+extern int cmd_merge_index(int argc, const char **argv, const char *prefix);
72
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);
git.c
+1
@@ -331,6 +331,7 @@ static void handle_internal_command(int argc, const char **argv)
331
{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
332
{ "merge-base", cmd_merge_base, RUN_SETUP },
333
{ "merge-file", cmd_merge_file },
334
+ { "merge-index", cmd_merge_index, RUN_SETUP },
335
{ "merge-ours", cmd_merge_ours, RUN_SETUP },
336
{ "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
337
{ "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },