make "merge-index" a built-in

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index e1c7ae58500916ac5adbd187029e7edcf8e6663f..70ac4b3e234ed4c421d36efc2987bf4ae6efdc9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -389,7 +389,6 @@ PROGRAMS += $(EXTRA_PROGRAMS)
 PROGRAMS += git-fast-import$X
 PROGRAMS += git-imap-send$X
 PROGRAMS += git-index-pack$X
-PROGRAMS += git-merge-index$X
 PROGRAMS += git-mktag$X
 PROGRAMS += git-pack-redundant$X
 PROGRAMS += git-shell$X
@@ -667,6 +666,7 @@ BUILTIN_OBJS += builtin-mailsplit.o
 BUILTIN_OBJS += builtin-merge.o
 BUILTIN_OBJS += builtin-merge-base.o
 BUILTIN_OBJS += builtin-merge-file.o
+BUILTIN_OBJS += builtin-merge-index.o
 BUILTIN_OBJS += builtin-merge-ours.o
 BUILTIN_OBJS += builtin-merge-recursive.o
 BUILTIN_OBJS += builtin-merge-tree.o

diff --git a/merge-index.c b/builtin-merge-index.c
similarity index 94%
rename from merge-index.c
rename to builtin-merge-index.c
index 19ddd03e0b2a57d03d85b1e5ca73b0bd4a0d6981..2c4cf5e559b4166973f12bda567e1a6c5657a7e7 100644 (file)
--- a/merge-index.c
+++ b/builtin-merge-index.c
@@ -66,7 +66,7 @@ static void merge_all(void)
        }
 }
 
-int main(int argc, char **argv)
+int cmd_merge_index(int argc, const char **argv, const char *prefix)
 {
        int i, force_file = 0;
 
@@ -78,9 +78,6 @@ int main(int argc, char **argv)
        if (argc < 3)
                usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
 
-       git_extract_argv0_path(argv[0]);
-
-       setup_git_directory();
        read_cache();
 
        i = 1;
@@ -94,7 +91,7 @@ int main(int argc, char **argv)
        }
        pgm = argv[i++];
        for (; i < argc; i++) {
-               char *arg = argv[i];
+               const char *arg = argv[i];
                if (!force_file && *arg == '-') {
                        if (!strcmp(arg, "--")) {
                                force_file = 1;

diff --git a/builtin.h b/builtin.h
index cb8489f97e4fba554f5abe97e3a76c615fba602e..e961b334241f2741b4e773f33217c95a9a0f93d3 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -68,6 +68,7 @@ extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
 extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
 extern int cmd_merge(int argc, const char **argv, const char *prefix);
 extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
+extern int cmd_merge_index(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);

diff --git a/git.c b/git.c
index b60999ca9ebdb3582ed8cc790e0722a450bb2e40..eae12e32eafcc6185e783f2be9859126e7aa4a33 100644 (file)
--- a/git.c
+++ b/git.c
@@ -331,6 +331,7 @@ static void handle_internal_command(int argc, const char **argv)
                { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
                { "merge-base", cmd_merge_base, RUN_SETUP },
                { "merge-file", cmd_merge_file },
+               { "merge-index", cmd_merge_index, RUN_SETUP },
                { "merge-ours", cmd_merge_ours, RUN_SETUP },
                { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
                { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },