Since `git-merge-one-file' has been rewritten and libified, this teaches
`merge-index' to call merge_three_way() without forking using a new
callback, merge_one_file_func().
To avoid any issue with a shrinking index because of the merge function
used (directly in the process or by forking), as described earlier, the
iterator of the loop of merge_all_index() is increased by the number of
entries with the same name, minus the difference between the number of
entries in the index before and after the merge.
This should handle a shrinking index correctly, but could lead to issues
with a growing index. However, this case is not treated, as there is no
callback that can produce such a case.
Signed-off-by: Alban Gruin <alban.gruin@xxxxxxxxx>
---
builtin/merge-index.c | 28 ++++++++++++++++++++++++++--
merge-strategies.c | 25 +++++++++++++++++++++----
merge-strategies.h | 7 +++++++
3 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index d5e5713b25..60fcde579f 100644
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -1,11 +1,15 @@
#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
+#include "lockfile.h"
#include "merge-strategies.h"
int cmd_merge_index(int argc, const char **argv, const char *prefix)
{
int i, force_file = 0, err = 0, one_shot = 0, quiet = 0;
const char *pgm;
+ void *data = NULL;
+ merge_fn merge_action;
+ struct lock_file lock = LOCK_INIT;
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
@@ -26,7 +30,18 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
quiet = 1;
i++;
}
+
pgm = argv[i++];
+ setup_work_tree();
+
+ if (!strcmp(pgm, "git-merge-one-file")) {
+ merge_action = merge_one_file_func;
+ hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
+ } else {
+ merge_action = merge_one_file_spawn;
+ data = (void *)pgm;
+ }
+
for (; i < argc; i++) {
const char *arg = argv[i];
if (!force_file && *arg == '-') {
@@ -36,13 +51,22 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
}
if (!strcmp(arg, "-a")) {
err |= merge_all_index(the_repository, one_shot, quiet,
- merge_one_file_spawn, (void *)pgm);
+ merge_action, data);
continue;
}
die("git merge-index: unknown option %s", arg);
}
err |= merge_index_path(the_repository, one_shot, quiet, arg,
- merge_one_file_spawn, (void *)pgm);
+ merge_action, data);
+ }
+
+ if (merge_action == merge_one_file_func) {
+ if (err) {
+ rollback_lock_file(&lock);
+ return err;
+ }
+
+ return write_locked_index(&the_index, &lock, COMMIT_LOCK);
}
return err;
}
diff --git a/merge-strategies.c b/merge-strategies.c
index 6f27e66dfe..542cefcf3d 100644
--- a/merge-strategies.c
+++ b/merge-strategies.c
@@ -178,6 +178,18 @@ int merge_three_way(struct repository *r,
return 0;
}
+int merge_one_file_func(struct repository *r,
+ const struct object_id *orig_blob,
+ const struct object_id *our_blob,
+ const struct object_id *their_blob, const char *path,
+ unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
+ void *data)
+{
+ return merge_three_way(r,
+ orig_blob, our_blob, their_blob, path,
+ orig_mode, our_mode, their_mode);
+}
+
int merge_one_file_spawn(struct repository *r,
const struct object_id *orig_blob,
const struct object_id *our_blob,
@@ -261,17 +273,22 @@ int merge_all_index(struct repository *r, int oneshot, int quiet,
merge_fn fn, void *data)
{
int err = 0, ret;
- unsigned int i;
+ unsigned int i, prev_nr;
for (i = 0; i < r->index->cache_nr; i++) {
const struct cache_entry *ce = r->index->cache[i];
if (!ce_stage(ce))
continue;
+ prev_nr = r->index->cache_nr;
ret = merge_entry(r, quiet || oneshot, i, ce->name, &err, fn, data);
- if (ret > 0)
- i += ret - 1;
- else if (ret == -1)
+ if (ret > 0) {
+ /* Don't bother handling an index that has
+ grown, since merge_one_file_func() can't grow
+ it, and merge_one_file_spawn() can't change
+ it. */
+ i += ret - (prev_nr - r->index->cache_nr) - 1;
+ } else if (ret == -1)
return -1;
if (err && !oneshot)
diff --git a/merge-strategies.h b/merge-strategies.h
index 94c40635c4..0b74d45431 100644
--- a/merge-strategies.h
+++ b/merge-strategies.h
@@ -16,6 +16,13 @@ typedef int (*merge_fn)(struct repository *r,
unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
void *data);
+int merge_one_file_func(struct repository *r,
+ const struct object_id *orig_blob,
+ const struct object_id *our_blob,
+ const struct object_id *their_blob, const char *path,
+ unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
+ void *data);
+
int merge_one_file_spawn(struct repository *r,
const struct object_id *orig_blob,
const struct object_id *our_blob,
--
2.29.2.260.ge31aba42fb
