Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
builtin/merge-index.c | 9 ++++++++-
builtin/merge.c | 2 +-
cache.h | 2 +-
merge.c | 4 +++-
sequencer.c | 2 +-
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index 1c3427c..53cc285 100644
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -4,14 +4,17 @@
static const char *pgm;
static int one_shot, quiet;
static int err;
+static int index_only;
static int merge_entry(int pos, const char *path)
{
int found;
- const char *arguments[] = { pgm, "", "", "", path, "", "", "", NULL };
+ const char *arguments[] = { pgm, "", "", "", path, "", "", "", "--index-only", NULL };
char hexbuf[4][GIT_SHA1_HEXSZ + 1];
char ownbuf[4][60];
+ if (!index_only)
+ arguments[8] = NULL;
if (pos >= active_nr)
die("git merge-index: %s not in the cache", path);
found = 0;
@@ -96,6 +99,10 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
force_file = 1;
continue;
}
+ if (!strcmp(arg, "--index-only")) {
+ index_only = 1;
+ continue;
+ }
if (!strcmp(arg, "-a")) {
merge_all();
continue;
diff --git a/builtin/merge.c b/builtin/merge.c
index b791702..d1fe3f9 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -690,7 +690,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
rollback_lock_file(&lock);
return clean ? 0 : 1;
} else {
- return try_merge_command(strategy, xopts_nr, xopts,
+ return try_merge_command(strategy, index_only, xopts_nr, xopts,
common, head_arg, remoteheads);
}
}
diff --git a/cache.h b/cache.h
index d51fcbc..d017155 100644
--- a/cache.h
+++ b/cache.h
@@ -1780,7 +1780,7 @@ extern struct startup_info *startup_info;
/* merge.c */
struct commit_list;
-int try_merge_command(const char *strategy, size_t xopts_nr,
+int try_merge_command(const char *strategy, int index_only, size_t xopts_nr,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes);
int checkout_fast_forward(const unsigned char *from,
diff --git a/merge.c b/merge.c
index a40307c..705a8d7 100644
--- a/merge.c
+++ b/merge.c
@@ -15,7 +15,7 @@ static const char *merge_argument(struct commit *commit)
return EMPTY_TREE_SHA1_HEX;
}
-int try_merge_command(const char *strategy, size_t xopts_nr,
+int try_merge_command(const char *strategy, int index_only, size_t xopts_nr,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes)
{
@@ -24,6 +24,8 @@ int try_merge_command(const char *strategy, size_t xopts_nr,
struct commit_list *j;
argv_array_pushf(&args, "merge-%s", strategy);
+ if (index_only)
+ argv_array_pushf(&args, "--index-only");
for (i = 0; i < xopts_nr; i++)
argv_array_pushf(&args, "--%s", xopts[i]);
for (j = common; j; j = j->next)
diff --git a/sequencer.c b/sequencer.c
index 1b772fb..2fa1101 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -570,7 +570,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
commit_list_insert(base, &common);
commit_list_insert(next, &remotes);
- res = try_merge_command(opts->strategy, opts->xopts_nr, opts->xopts,
+ res = try_merge_command(opts->strategy, 0, opts->xopts_nr, opts->xopts,
common, sha1_to_hex(head), remotes);
free_commit_list(common);
free_commit_list(remotes);
--
2.8.0.18.gc685494
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html