From 0ecace728f8e48b87f81433b053d7f277f22e674 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 22 Jan 2010 07:29:21 -0800 Subject: [PATCH] make "merge-index" a built-in Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- Makefile | 2 +- merge-index.c => builtin-merge-index.c | 7 ++----- builtin.h | 1 + git.c | 1 + 4 files changed, 5 insertions(+), 6 deletions(-) rename merge-index.c => builtin-merge-index.c (94%) diff --git a/Makefile b/Makefile index e1c7ae585..70ac4b3e2 100644 --- 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 19ddd03e0..2c4cf5e55 100644 --- 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] (-a | [--] *)"); - 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 cb8489f97..e961b3342 100644 --- 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 b60999ca9..eae12e32e 100644 --- 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 }, -- 2.30.2