Commit a1f5d691a2bcaa83f60500b98ce5f393e7c03ad9
2015-10-27T22:42:15
merge: Implement `GIT_MERGE_TREE_SKIP_REUC`
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
diff --git a/include/git2/merge.h b/include/git2/merge.h
index ced9e51..b7da63e 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -79,6 +79,11 @@ typedef enum {
* GIT_EMERGECONFLICT and no index will be returned.
*/
GIT_MERGE_TREE_FAIL_ON_CONFLICT = (1 << 1),
+
+ /**
+ * Do not write the REUC extension on the generated index
+ */
+ GIT_MERGE_TREE_SKIP_REUC = (1 << 2),
} git_merge_tree_flag_t;
/**
diff --git a/src/merge.c b/src/merge.c
index 3bed0fd..29184f6 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -1541,7 +1541,45 @@ static int merge_index_insert_reuc(
mode[0], oid[0], mode[1], oid[1], mode[2], oid[2]);
}
-int index_from_diff_list(git_index **out, git_merge_diff_list *diff_list)
+static int index_update_reuc(git_index *index, git_merge_diff_list *diff_list)
+{
+ int error;
+ size_t i;
+ git_merge_diff *conflict;
+
+ /* Add each entry in the resolved conflict to the REUC independently, since
+ * the paths may differ due to renames. */
+ git_vector_foreach(&diff_list->resolved, i, conflict) {
+ const git_index_entry *ancestor =
+ GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ?
+ &conflict->ancestor_entry : NULL;
+
+ const git_index_entry *ours =
+ GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ?
+ &conflict->our_entry : NULL;
+
+ const git_index_entry *theirs =
+ GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ?
+ &conflict->their_entry : NULL;
+
+ if (ancestor != NULL &&
+ (error = merge_index_insert_reuc(index, TREE_IDX_ANCESTOR, ancestor)) < 0)
+ return error;
+
+ if (ours != NULL &&
+ (error = merge_index_insert_reuc(index, TREE_IDX_OURS, ours)) < 0)
+ return error;
+
+ if (theirs != NULL &&
+ (error = merge_index_insert_reuc(index, TREE_IDX_THEIRS, theirs)) < 0)
+ return error;
+ }
+
+ return 0;
+}
+
+static int index_from_diff_list(git_index **out,
+ git_merge_diff_list *diff_list, bool skip_reuc)
{
git_index *index;
size_t i;
@@ -1600,31 +1638,8 @@ int index_from_diff_list(git_index **out, git_merge_diff_list *diff_list)
}
}
- /* Add each entry in the resolved conflict to the REUC independently, since
- * the paths may differ due to renames. */
- git_vector_foreach(&diff_list->resolved, i, conflict) {
- const git_index_entry *ancestor =
- GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ?
- &conflict->ancestor_entry : NULL;
-
- const git_index_entry *ours =
- GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ?
- &conflict->our_entry : NULL;
-
- const git_index_entry *theirs =
- GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ?
- &conflict->their_entry : NULL;
-
- if (ancestor != NULL &&
- (error = merge_index_insert_reuc(index, TREE_IDX_ANCESTOR, ancestor)) < 0)
- goto on_error;
-
- if (ours != NULL &&
- (error = merge_index_insert_reuc(index, TREE_IDX_OURS, ours)) < 0)
- goto on_error;
-
- if (theirs != NULL &&
- (error = merge_index_insert_reuc(index, TREE_IDX_THEIRS, theirs)) < 0)
+ if (!skip_reuc) {
+ if ((error = index_update_reuc(index, diff_list)) < 0)
goto on_error;
}
@@ -1633,7 +1648,6 @@ int index_from_diff_list(git_index **out, git_merge_diff_list *diff_list)
on_error:
git_index_free(index);
-
return error;
}
@@ -1715,7 +1729,8 @@ int git_merge__iterators(
if (!given_opts || !given_opts->metric)
git__free(opts.metric);
- error = index_from_diff_list(out, diff_list);
+ error = index_from_diff_list(out, diff_list,
+ (opts.tree_flags & GIT_MERGE_TREE_SKIP_REUC));
done:
git_merge_diff_list__free(diff_list);