Skip to content

G
git2
Commit 85a41fc4 by Vicent Marti
Options

Merge pull request #2183 from ethomson/merge_refactor 

Refactor the `git_merge` API
parents f57cc638 58c2b1c4
Showing with 602 additions and 482 deletions
include/git2/revert.h
...@@ -26,12 +26,12 @@ typedef struct { ...@@ -26,12 +26,12 @@ typedef struct {
/** For merge commits, the "mainline" is treated as the parent. */ /** For merge commits, the "mainline" is treated as the parent. */
unsigned int mainline; unsigned int mainline;
git_merge_tree_opts merge_tree_opts; git_merge_options merge_opts;
git_checkout_options checkout_opts; git_checkout_options checkout_opts;
} git_revert_options; } git_revert_options;
#define GIT_REVERT_OPTIONS_VERSION 1 #define GIT_REVERT_OPTIONS_VERSION 1
#define GIT_REVERT_OPTIONS_INIT {GIT_REVERT_OPTIONS_VERSION, 0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTIONS_INIT} #define GIT_REVERT_OPTIONS_INIT {GIT_REVERT_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT}
/** /**
* Initializes a `git_revert_options` with default values. Equivalent to * Initializes a `git_revert_options` with default values. Equivalent to
...@@ -66,7 +66,7 @@ int git_revert_commit( ...@@ -66,7 +66,7 @@ int git_revert_commit(
git_commit *revert_commit, git_commit *revert_commit,
git_commit *our_commit, git_commit *our_commit,
unsigned int mainline, unsigned int mainline,
const git_merge_tree_opts *merge_tree_opts); const git_merge_options *merge_options);
/** /**
* Reverts the given commit, producing changes in the working directory. * Reverts the given commit, producing changes in the working directory.
......
src/checkout.c
...@@ -1681,29 +1681,20 @@ static int checkout_write_merge( ...@@ -1681,29 +1681,20 @@ static int checkout_write_merge(
{ {
git_buf our_label = GIT_BUF_INIT, their_label = GIT_BUF_INIT, git_buf our_label = GIT_BUF_INIT, their_label = GIT_BUF_INIT,
path_suffixed = GIT_BUF_INIT, path_workdir = GIT_BUF_INIT; path_suffixed = GIT_BUF_INIT, path_workdir = GIT_BUF_INIT;
git_merge_file_options merge_file_opts = GIT_MERGE_FILE_OPTIONS_INIT; git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT;
git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, git_merge_file_result result = {0};
ours = GIT_MERGE_FILE_INPUT_INIT,
theirs = GIT_MERGE_FILE_INPUT_INIT;
git_merge_file_result result = GIT_MERGE_FILE_RESULT_INIT;
git_filebuf output = GIT_FILEBUF_INIT; git_filebuf output = GIT_FILEBUF_INIT;
int error = 0; int error = 0;
if (data->opts.checkout_strategy & GIT_CHECKOUT_CONFLICT_STYLE_DIFF3) if (data->opts.checkout_strategy & GIT_CHECKOUT_CONFLICT_STYLE_DIFF3)
merge_file_opts.style = GIT_MERGE_FILE_STYLE_DIFF3; opts.flags |= GIT_MERGE_FILE_STYLE_DIFF3;
if ((conflict->ancestor &&
(error = git_merge_file_input_from_index_entry(
&ancestor, data->repo, conflict->ancestor)) < 0) ||
(error = git_merge_file_input_from_index_entry(
&ours, data->repo, conflict->ours)) < 0 ||
(error = git_merge_file_input_from_index_entry(
&theirs, data->repo, conflict->theirs)) < 0)
goto done;
ancestor.label = data->opts.ancestor_label ? data->opts.ancestor_label : "ancestor"; opts.ancestor_label = data->opts.ancestor_label ?
ours.label = data->opts.our_label ? data->opts.our_label : "ours"; data->opts.ancestor_label : "ancestor";
theirs.label = data->opts.their_label ? data->opts.their_label : "theirs"; opts.our_label = data->opts.our_label ?
data->opts.our_label : "ours";
opts.their_label = data->opts.their_label ?
data->opts.their_label : "theirs";
/* If all the paths are identical, decorate the diff3 file with the branch /* If all the paths are identical, decorate the diff3 file with the branch
* names. Otherwise, append branch_name:path. * names. Otherwise, append branch_name:path.
...@@ -1712,16 +1703,17 @@ static int checkout_write_merge( ...@@ -1712,16 +1703,17 @@ static int checkout_write_merge(
strcmp(conflict->ours->path, conflict->theirs->path) != 0) { strcmp(conflict->ours->path, conflict->theirs->path) != 0) {
if ((error = conflict_entry_name( if ((error = conflict_entry_name(
&our_label, ours.label, conflict->ours->path)) < 0 || &our_label, opts.our_label, conflict->ours->path)) < 0 ||
(error = conflict_entry_name( (error = conflict_entry_name(
&their_label, theirs.label, conflict->theirs->path)) < 0) &their_label, opts.their_label, conflict->theirs->path)) < 0)
goto done; goto done;
ours.label = git_buf_cstr(&our_label); opts.our_label = git_buf_cstr(&our_label);
theirs.label = git_buf_cstr(&their_label); opts.their_label = git_buf_cstr(&their_label);
} }
if ((error = git_merge_files(&result, &ancestor, &ours, &theirs, &merge_file_opts)) < 0) if ((error = git_merge_file_from_index(&result, data->repo,
conflict->ancestor, conflict->ours, conflict->theirs, &opts)) < 0)
goto done; goto done;
if (result.path == NULL || result.mode == 0) { if (result.path == NULL || result.mode == 0) {
...@@ -1739,7 +1731,7 @@ static int checkout_write_merge( ...@@ -1739,7 +1731,7 @@ static int checkout_write_merge(
if ((error = git_futils_mkpath2file(path_workdir.ptr, 0755)) < 0 || if ((error = git_futils_mkpath2file(path_workdir.ptr, 0755)) < 0 ||
(error = git_filebuf_open(&output, path_workdir.ptr, GIT_FILEBUF_DO_NOT_BUFFER, result.mode)) < 0 || (error = git_filebuf_open(&output, path_workdir.ptr, GIT_FILEBUF_DO_NOT_BUFFER, result.mode)) < 0 ||
(error = git_filebuf_write(&output, result.data, result.len)) < 0 || (error = git_filebuf_write(&output, result.ptr, result.len)) < 0 ||
(error = git_filebuf_commit(&output)) < 0) (error = git_filebuf_commit(&output)) < 0)
goto done; goto done;
...@@ -1747,9 +1739,6 @@ done: ...@@ -1747,9 +1739,6 @@ done:
git_buf_free(&our_label); git_buf_free(&our_label);
git_buf_free(&their_label); git_buf_free(&their_label);
git_merge_file_input_free(&ancestor);
git_merge_file_input_free(&ours);
git_merge_file_input_free(&theirs);
git_merge_file_result_free(&result); git_merge_file_result_free(&result);
git_buf_free(&path_workdir); git_buf_free(&path_workdir);
git_buf_free(&path_suffixed); git_buf_free(&path_suffixed);
......
src/index.c
...@@ -300,7 +300,7 @@ static void index_entry_free(git_index_entry *entry) ...@@ -300,7 +300,7 @@ static void index_entry_free(git_index_entry *entry)
git__free(entry); git__free(entry);
} }
static unsigned int index_create_mode(unsigned int mode) unsigned int git_index__create_mode(unsigned int mode)
{ {
if (S_ISLNK(mode)) if (S_ISLNK(mode))
return S_IFLNK; return S_IFLNK;
...@@ -320,9 +320,9 @@ static unsigned int index_merge_mode( ...@@ -320,9 +320,9 @@ static unsigned int index_merge_mode(
if (index->distrust_filemode && S_ISREG(mode)) if (index->distrust_filemode && S_ISREG(mode))
return (existing && S_ISREG(existing->mode)) ? return (existing && S_ISREG(existing->mode)) ?
existing->mode : index_create_mode(0666); existing->mode : git_index__create_mode(0666);
return index_create_mode(mode); return git_index__create_mode(mode);
} }
void git_index__set_ignore_case(git_index *index, bool ignore_case) void git_index__set_ignore_case(git_index *index, bool ignore_case)
...@@ -619,7 +619,7 @@ void git_index_entry__init_from_stat( ...@@ -619,7 +619,7 @@ void git_index_entry__init_from_stat(
entry->dev = st->st_rdev; entry->dev = st->st_rdev;
entry->ino = st->st_ino; entry->ino = st->st_ino;
entry->mode = (!trust_mode && S_ISREG(st->st_mode)) ? entry->mode = (!trust_mode && S_ISREG(st->st_mode)) ?
index_create_mode(0666) : index_create_mode(st->st_mode); git_index__create_mode(0666) : git_index__create_mode(st->st_mode);
entry->uid = st->st_uid; entry->uid = st->st_uid;
entry->gid = st->st_gid; entry->gid = st->st_gid;
entry->file_size = st->st_size; entry->file_size = st->st_size;
......
src/index.h
...@@ -60,4 +60,6 @@ extern int git_index__find( ...@@ -60,4 +60,6 @@ extern int git_index__find(
extern void git_index__set_ignore_case(git_index *index, bool ignore_case); extern void git_index__set_ignore_case(git_index *index, bool ignore_case);
extern unsigned int git_index__create_mode(unsigned int mode);
#endif #endif
src/merge.h
...@@ -120,16 +120,6 @@ struct git_merge_head { ...@@ -120,16 +120,6 @@ struct git_merge_head {
git_commit *commit; git_commit *commit;
}; };
/** Internal structure for merge results */
struct git_merge_result {
bool is_uptodate;
bool is_fastforward;
git_oid fastforward_oid;
git_index *index;
};
int git_merge__bases_many( int git_merge__bases_many(
git_commit_list **out, git_commit_list **out,
git_revwalk *walk, git_revwalk *walk,
...@@ -147,7 +137,7 @@ int git_merge_diff_list__find_differences(git_merge_diff_list *merge_diff_list, ...@@ -147,7 +137,7 @@ int git_merge_diff_list__find_differences(git_merge_diff_list *merge_diff_list,
const git_tree *ours_tree, const git_tree *ours_tree,
const git_tree *theirs_tree); const git_tree *theirs_tree);
int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list *merge_diff_list, const git_merge_tree_opts *opts); int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list *merge_diff_list, const git_merge_options *opts);
void git_merge_diff_list__free(git_merge_diff_list *diff_list); void git_merge_diff_list__free(git_merge_diff_list *diff_list);
...@@ -156,9 +146,8 @@ void git_merge_diff_list__free(git_merge_diff_list *diff_list); ...@@ -156,9 +146,8 @@ void git_merge_diff_list__free(git_merge_diff_list *diff_list);
int git_merge__setup( int git_merge__setup(
git_repository *repo, git_repository *repo,
const git_merge_head *our_head, const git_merge_head *our_head,
const git_merge_head *their_heads[], const git_merge_head *heads[],
size_t their_heads_len, size_t heads_len);
unsigned int flags);
int git_merge__indexes(git_repository *repo, git_index *index_new); int git_merge__indexes(git_repository *repo, git_index *index_new);
......
src/merge_file.c
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
#include "common.h" #include "common.h"
#include "repository.h" #include "repository.h"
#include "merge_file.h" #include "merge_file.h"
#include "posix.h"
#include "fileops.h"
#include "index.h"
#include "git2/repository.h" #include "git2/repository.h"
#include "git2/object.h" #include "git2/object.h"
...@@ -22,17 +25,17 @@ GIT_INLINE(const char *) merge_file_best_path( ...@@ -22,17 +25,17 @@ GIT_INLINE(const char *) merge_file_best_path(
const git_merge_file_input *ours, const git_merge_file_input *ours,
const git_merge_file_input *theirs) const git_merge_file_input *theirs)
{ {
if (!GIT_MERGE_FILE_SIDE_EXISTS(ancestor)) { if (!ancestor) {
if (strcmp(ours->path, theirs->path) == 0) if (ours && theirs && strcmp(ours->path, theirs->path) == 0)
return ours->path; return ours->path;
return NULL; return NULL;
} }
if (strcmp(ancestor->path, ours->path) == 0) if (ours && strcmp(ancestor->path, ours->path) == 0)
return theirs->path; return theirs ? theirs->path : NULL;
else if(strcmp(ancestor->path, theirs->path) == 0) else if(theirs && strcmp(ancestor->path, theirs->path) == 0)
return ours->path; return ours ? ours->path : NULL;
return NULL; return NULL;
} }
...@@ -47,136 +50,230 @@ GIT_INLINE(int) merge_file_best_mode( ...@@ -47,136 +50,230 @@ GIT_INLINE(int) merge_file_best_mode(
* assume executable. Otherwise, if any mode changed from the ancestor, * assume executable. Otherwise, if any mode changed from the ancestor,
* use that one. * use that one.
*/ */
if (!GIT_MERGE_FILE_SIDE_EXISTS(ancestor)) { if (!ancestor) {
if (ours->mode == GIT_FILEMODE_BLOB_EXECUTABLE || if ((ours && ours->mode == GIT_FILEMODE_BLOB_EXECUTABLE) ||
theirs->mode == GIT_FILEMODE_BLOB_EXECUTABLE) (theirs && theirs->mode == GIT_FILEMODE_BLOB_EXECUTABLE))
return GIT_FILEMODE_BLOB_EXECUTABLE; return GIT_FILEMODE_BLOB_EXECUTABLE;
return GIT_FILEMODE_BLOB; return GIT_FILEMODE_BLOB;
} } else if (ours && theirs) {
if (ancestor->mode == ours->mode)
return theirs->mode;
if (ancestor->mode == ours->mode)
return theirs->mode;
else if(ancestor->mode == theirs->mode)
return ours->mode; return ours->mode;
}
return 0; return 0;
} }
int git_merge_file_input_from_index_entry( int git_merge_file__input_from_index(
git_merge_file_input *input, git_merge_file_input *input_out,
git_repository *repo, git_odb_object **odb_object_out,
git_odb *odb,
const git_index_entry *entry) const git_index_entry *entry)
{ {
git_odb *odb = NULL;
int error = 0; int error = 0;
assert(input && repo && entry); assert(input_out && odb_object_out && odb && entry);
if (entry->mode == 0)
return 0;
if ((error = git_repository_odb(&odb, repo)) < 0 || if ((error = git_odb_read(odb_object_out, odb, &entry->id)) < 0)
(error = git_odb_read(&input->odb_object, odb, &entry->id)) < 0)
goto done; goto done;
input->mode = entry->mode; input_out->path = entry->path;
input->path = git__strdup(entry->path); input_out->mode = entry->mode;
input->mmfile.size = git_odb_object_size(input->odb_object); input_out->ptr = (char *)git_odb_object_data(*odb_object_out);
input->mmfile.ptr = (char *)git_odb_object_data(input->odb_object); input_out->size = git_odb_object_size(*odb_object_out);
if (input->label == NULL)
input->label = entry->path;
done: done:
git_odb_free(odb);
return error; return error;
} }
int git_merge_file_input_from_diff_file( static void merge_file_normalize_opts(
git_merge_file_input *input, git_merge_file_options *out,
git_repository *repo, const git_merge_file_options *given_opts)
const git_diff_file *file)
{ {
git_odb *odb = NULL; if (given_opts)
int error = 0; memcpy(out, given_opts, sizeof(git_merge_file_options));
else {
assert(input && repo && file); git_merge_file_options default_opts = GIT_MERGE_FILE_OPTIONS_INIT;
memcpy(out, &default_opts, sizeof(git_merge_file_options));
if (file->mode == 0) }
return 0;
if ((error = git_repository_odb(&odb, repo)) < 0 ||
(error = git_odb_read(&input->odb_object, odb, &file->id)) < 0)
goto done;
input->mode = file->mode;
input->path = git__strdup(file->path);
input->mmfile.size = git_odb_object_size(input->odb_object);
input->mmfile.ptr = (char *)git_odb_object_data(input->odb_object);
if (input->label == NULL)
input->label = file->path;
done:
git_odb_free(odb);
return error;
} }
int git_merge_files( static int git_merge_file__from_inputs(
git_merge_file_result *out, git_merge_file_result *out,
git_merge_file_input *ancestor, const git_merge_file_input *ancestor,
git_merge_file_input *ours, const git_merge_file_input *ours,
git_merge_file_input *theirs, const git_merge_file_input *theirs,
git_merge_file_options *opts) const git_merge_file_options *given_opts)
{ {
xmparam_t xmparam; xmparam_t xmparam;
mmfile_t ancestor_mmfile = {0}, our_mmfile = {0}, their_mmfile = {0};
mmbuffer_t mmbuffer; mmbuffer_t mmbuffer;
git_merge_file_options options = GIT_MERGE_FILE_OPTIONS_INIT;
const char *path;
int xdl_result; int xdl_result;
int error = 0; int error = 0;
assert(out && ancestor && ours && theirs);
memset(out, 0x0, sizeof(git_merge_file_result)); memset(out, 0x0, sizeof(git_merge_file_result));
if (!GIT_MERGE_FILE_SIDE_EXISTS(ours) || !GIT_MERGE_FILE_SIDE_EXISTS(theirs)) merge_file_normalize_opts(&options, given_opts);
return 0;
memset(&xmparam, 0x0, sizeof(xmparam_t)); memset(&xmparam, 0x0, sizeof(xmparam_t));
xmparam.ancestor = ancestor->label;
xmparam.file1 = ours->label;
xmparam.file2 = theirs->label;
out->path = merge_file_best_path(ancestor, ours, theirs); if (ancestor) {
out->mode = merge_file_best_mode(ancestor, ours, theirs); xmparam.ancestor = (options.ancestor_label) ?
options.ancestor_label : ancestor->path;
ancestor_mmfile.ptr = (char *)ancestor->ptr;
ancestor_mmfile.size = ancestor->size;
}
if (opts && opts->favor == GIT_MERGE_FILE_FAVOR_OURS) xmparam.file1 = (options.our_label) ?
options.our_label : ours->path;
our_mmfile.ptr = (char *)ours->ptr;
our_mmfile.size = ours->size;
xmparam.file2 = (options.their_label) ?
options.their_label : theirs->path;
their_mmfile.ptr = (char *)theirs->ptr;
their_mmfile.size = theirs->size;
if (options.favor == GIT_MERGE_FILE_FAVOR_OURS)
xmparam.favor = XDL_MERGE_FAVOR_OURS; xmparam.favor = XDL_MERGE_FAVOR_OURS;
else if (opts && opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) else if (options.favor == GIT_MERGE_FILE_FAVOR_THEIRS)
xmparam.favor = XDL_MERGE_FAVOR_THEIRS; xmparam.favor = XDL_MERGE_FAVOR_THEIRS;
else if (opts && opts->favor == GIT_MERGE_FILE_FAVOR_UNION) else if (options.favor == GIT_MERGE_FILE_FAVOR_UNION)
xmparam.favor = XDL_MERGE_FAVOR_UNION; xmparam.favor = XDL_MERGE_FAVOR_UNION;
xmparam.level = xmparam.level = (options.flags & GIT_MERGE_FILE_SIMPLIFY_ALNUM) ?
(opts && (opts->flags & GIT_MERGE_FILE_SIMPLIFY_ALNUM)) ?
XDL_MERGE_ZEALOUS_ALNUM : XDL_MERGE_ZEALOUS; XDL_MERGE_ZEALOUS_ALNUM : XDL_MERGE_ZEALOUS;
if (opts && opts->style == GIT_MERGE_FILE_STYLE_DIFF3) if (options.flags & GIT_MERGE_FILE_STYLE_DIFF3)
xmparam.style = XDL_MERGE_DIFF3; xmparam.style = XDL_MERGE_DIFF3;
if ((xdl_result = xdl_merge(&ancestor->mmfile, &ours->mmfile, if ((xdl_result = xdl_merge(&ancestor_mmfile, &our_mmfile,
&theirs->mmfile, &xmparam, &mmbuffer)) < 0) { &their_mmfile, &xmparam, &mmbuffer)) < 0) {
giterr_set(GITERR_MERGE, "Failed to merge files."); giterr_set(GITERR_MERGE, "Failed to merge files.");
error = -1; error = -1;
goto done; goto done;
} }
if ((path = merge_file_best_path(ancestor, ours, theirs)) != NULL &&
(out->path = strdup(path)) == NULL) {
error = -1;
goto done;
}
out->automergeable = (xdl_result == 0); out->automergeable = (xdl_result == 0);
out->data = (unsigned char *)mmbuffer.ptr; out->ptr = (unsigned char *)mmbuffer.ptr;
out->len = mmbuffer.size; out->len = mmbuffer.size;
out->mode = merge_file_best_mode(ancestor, ours, theirs);
done: done:
if (error < 0)
git_merge_file_result_free(out);
return error; return error;
} }
static git_merge_file_input *git_merge_file__normalize_inputs(
git_merge_file_input *out,
const git_merge_file_input *given)
{
memcpy(out, given, sizeof(git_merge_file_input));
if (!out->path)
out->path = "file.txt";
if (!out->mode)
out->mode = 0100644;
return out;
}
int git_merge_file(
git_merge_file_result *out,
const git_merge_file_input *ancestor,
const git_merge_file_input *ours,
const git_merge_file_input *theirs,
const git_merge_file_options *options)
{
git_merge_file_input inputs[3] = { {0} };
assert(out && ours && theirs);
memset(out, 0x0, sizeof(git_merge_file_result));
if (ancestor)
ancestor = git_merge_file__normalize_inputs(&inputs[0], ancestor);
ours = git_merge_file__normalize_inputs(&inputs[1], ours);
theirs = git_merge_file__normalize_inputs(&inputs[2], theirs);
return git_merge_file__from_inputs(out, ancestor, ours, theirs, options);
}
int git_merge_file_from_index(
git_merge_file_result *out,
git_repository *repo,
const git_index_entry *ancestor,
const git_index_entry *ours,
const git_index_entry *theirs,
const git_merge_file_options *options)
{
git_merge_file_input inputs[3] = { {0} },
*ancestor_input = NULL, *our_input = NULL, *their_input = NULL;
git_odb *odb = NULL;
git_odb_object *odb_object[3] = { 0 };
int error = 0;
assert(out && repo && ours && theirs);
memset(out, 0x0, sizeof(git_merge_file_result));
if ((error = git_repository_odb(&odb, repo)) < 0)
goto done;
if (ancestor) {
if ((error = git_merge_file__input_from_index(
&inputs[0], &odb_object[0], odb, ancestor)) < 0)
goto done;
ancestor_input = &inputs[0];
}
if ((error = git_merge_file__input_from_index(
&inputs[1], &odb_object[1], odb, ours)) < 0)
goto done;
our_input = &inputs[1];
if ((error = git_merge_file__input_from_index(
&inputs[2], &odb_object[2], odb, theirs)) < 0)
goto done;
their_input = &inputs[2];
if ((error = git_merge_file__from_inputs(out,
ancestor_input, our_input, their_input, options)) < 0)
goto done;
done:
git_odb_object_free(odb_object[0]);
git_odb_object_free(odb_object[1]);
git_odb_object_free(odb_object[2]);
git_odb_free(odb);
return error;
}
void git_merge_file_result_free(git_merge_file_result *result)
{
if (result == NULL)
return;
git__free(result->path);
/* xdiff uses malloc() not git_malloc, so we use free(), not git_free() */
free(result->ptr);
}
src/merge_file.h
...@@ -11,82 +11,4 @@ ...@@ -11,82 +11,4 @@
#include "git2/merge.h" #include "git2/merge.h"
typedef struct {
const char *label;
char *path;
unsigned int mode;
mmfile_t mmfile;
git_odb_object *odb_object;
} git_merge_file_input;
#define GIT_MERGE_FILE_INPUT_INIT {0}
typedef struct {
bool automergeable;
const char *path;
int mode;
unsigned char *data;
size_t len;
} git_merge_file_result;
#define GIT_MERGE_FILE_RESULT_INIT {0}
typedef enum {
/* Condense non-alphanumeric regions for simplified diff file */
GIT_MERGE_FILE_SIMPLIFY_ALNUM = (1 << 0),
} git_merge_file_flags_t;
typedef enum {
/* Create standard conflicted merge files */
GIT_MERGE_FILE_STYLE_MERGE = 0,
/* Create diff3-style files */
GIT_MERGE_FILE_STYLE_DIFF3 = 1,
} git_merge_file_style_t;
typedef struct {
git_merge_file_favor_t favor;
git_merge_file_flags_t flags;
git_merge_file_style_t style;
} git_merge_file_options;
#define GIT_MERGE_FILE_OPTIONS_INIT {0}
int git_merge_file_input_from_index_entry(
git_merge_file_input *input,
git_repository *repo,
const git_index_entry *entry);
int git_merge_file_input_from_diff_file(
git_merge_file_input *input,
git_repository *repo,
const git_diff_file *file);
int git_merge_files(
git_merge_file_result *out,
git_merge_file_input *ancestor,
git_merge_file_input *ours,
git_merge_file_input *theirs,
git_merge_file_options *opts);
GIT_INLINE(void) git_merge_file_input_free(git_merge_file_input *input)
{
assert(input);
git__free(input->path);
git_odb_object_free(input->odb_object);
}
GIT_INLINE(void) git_merge_file_result_free(git_merge_file_result *filediff)
{
if (filediff == NULL)
return;
/* xdiff uses malloc() not git_malloc, so we use free(), not git_free() */
if (filediff->data != NULL)
free(filediff->data);
}
#endif #endif
src/revert.c
...@@ -121,7 +121,7 @@ int git_revert_commit( ...@@ -121,7 +121,7 @@ int git_revert_commit(
git_commit *revert_commit, git_commit *revert_commit,
git_commit *our_commit, git_commit *our_commit,
unsigned int mainline, unsigned int mainline,
const git_merge_tree_opts *merge_tree_opts) const git_merge_options *merge_opts)
{ {
git_commit *parent_commit = NULL; git_commit *parent_commit = NULL;
git_tree *parent_tree = NULL, *our_tree = NULL, *revert_tree = NULL; git_tree *parent_tree = NULL, *our_tree = NULL, *revert_tree = NULL;
...@@ -152,7 +152,7 @@ int git_revert_commit( ...@@ -152,7 +152,7 @@ int git_revert_commit(
(error = git_commit_tree(&our_tree, our_commit)) < 0) (error = git_commit_tree(&our_tree, our_commit)) < 0)
goto done; goto done;
error = git_merge_trees(out, repo, revert_tree, our_tree, parent_tree, merge_tree_opts); error = git_merge_trees(out, repo, revert_tree, our_tree, parent_tree, merge_opts);
done: done:
git_tree_free(parent_tree); git_tree_free(parent_tree);
...@@ -198,7 +198,7 @@ int git_revert( ...@@ -198,7 +198,7 @@ int git_revert(
(error = write_merge_msg(repo, commit_oidstr, commit_msg)) < 0 || (error = write_merge_msg(repo, commit_oidstr, commit_msg)) < 0 ||
(error = git_repository_head(&our_ref, repo)) < 0 || (error = git_repository_head(&our_ref, repo)) < 0 ||
(error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJ_COMMIT)) < 0 || (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJ_COMMIT)) < 0 ||
(error = git_revert_commit(&index_new, repo, commit, our_commit, opts.mainline, &opts.merge_tree_opts)) < 0 || (error = git_revert_commit(&index_new, repo, commit, our_commit, opts.mainline, &opts.merge_opts)) < 0 ||
(error = git_merge__indexes(repo, index_new)) < 0 || (error = git_merge__indexes(repo, index_new)) < 0 ||
(error = git_repository_index(&index_repo, repo)) < 0 || (error = git_repository_index(&index_repo, repo)) < 0 ||
(error = git_checkout_index(repo, index_repo, &opts.checkout_opts)) < 0) (error = git_checkout_index(repo, index_repo, &opts.checkout_opts)) < 0)
......
tests/merge/files.c 0 → 100644
#include "clar_libgit2.h"
#include "git2/repository.h"
#include "git2/merge.h"
#include "buffer.h"
#include "merge.h"
#include "merge_helpers.h"
#include "refs.h"
#include "fileops.h"
#define TEST_REPO_PATH "merge-resolve"
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
static git_repository *repo;
static git_index *repo_index;
// Fixture setup and teardown
void test_merge_files__initialize(void)
{
git_config *cfg;
repo = cl_git_sandbox_init(TEST_REPO_PATH);
git_repository_index(&repo_index, repo);
/* Ensure that the user's merge.conflictstyle doesn't interfere */
cl_git_pass(git_repository_config(&cfg, repo));
cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge"));
git_config_free(cfg);
}
void test_merge_files__cleanup(void)
{
git_index_free(repo_index);
cl_git_sandbox_cleanup();
}
void test_merge_files__automerge_from_bufs(void)
{
git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT,
ours = GIT_MERGE_FILE_INPUT_INIT,
theirs = GIT_MERGE_FILE_INPUT_INIT;
git_merge_file_result result = {0};
const char *expected = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n";
ancestor.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n";
ancestor.size = strlen(ancestor.ptr);
ancestor.path = "testfile.txt";
ancestor.mode = 0100755;
ours.ptr = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n";
ours.size = strlen(ours.ptr);
ours.path = "testfile.txt";
ours.mode = 0100755;
theirs.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n";
theirs.size = strlen(theirs.ptr);
theirs.path = "testfile.txt";
theirs.mode = 0100755;
cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, 0));
cl_assert_equal_i(1, result.automergeable);
cl_assert_equal_s("testfile.txt", result.path);
cl_assert_equal_i(0100755, result.mode);
cl_assert_equal_i(strlen(expected), result.len);
cl_assert_equal_strn(expected, result.ptr, result.len);
git_merge_file_result_free(&result);
}
void test_merge_files__automerge_use_best_path_and_mode(void)
{
git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT,
ours = GIT_MERGE_FILE_INPUT_INIT,
theirs = GIT_MERGE_FILE_INPUT_INIT;
git_merge_file_result result = {0};
const char *expected = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n";
ancestor.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n";
ancestor.size = strlen(ancestor.ptr);
ancestor.path = "testfile.txt";
ancestor.mode = 0100755;
ours.ptr = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n";
ours.size = strlen(ours.ptr);
ours.path = "testfile.txt";
ours.mode = 0100644;
theirs.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n";
theirs.size = strlen(theirs.ptr);
theirs.path = "theirs.txt";
theirs.mode = 0100755;
cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, 0));
cl_assert_equal_i(1, result.automergeable);
cl_assert_equal_s("theirs.txt", result.path);
cl_assert_equal_i(0100644, result.mode);
cl_assert_equal_i(strlen(expected), result.len);
cl_assert_equal_strn(expected, result.ptr, result.len);
git_merge_file_result_free(&result);
}
void test_merge_files__conflict_from_bufs(void)
{
git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT,
ours = GIT_MERGE_FILE_INPUT_INIT,
theirs = GIT_MERGE_FILE_INPUT_INIT;
git_merge_file_result result = {0};
const char *expected = "<<<<<<< testfile.txt\nAloha!\nOurs.\n=======\nHi!\nTheirs.\n>>>>>>> theirs.txt\n";
size_t expected_len = strlen(expected);
ancestor.ptr = "Hello!\nAncestor!\n";
ancestor.size = strlen(ancestor.ptr);
ancestor.path = "testfile.txt";
ancestor.mode = 0100755;
ours.ptr = "Aloha!\nOurs.\n";
ours.size = strlen(ours.ptr);
ours.path = "testfile.txt";
ours.mode = 0100644;
theirs.ptr = "Hi!\nTheirs.\n";
theirs.size = strlen(theirs.ptr);
theirs.path = "theirs.txt";
theirs.mode = 0100755;
cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, NULL));
cl_assert_equal_i(0, result.automergeable);
cl_assert_equal_s("theirs.txt", result.path);
cl_assert_equal_i(0100644, result.mode);
cl_assert_equal_i(expected_len, result.len);
cl_assert_equal_strn(expected, result.ptr, expected_len);
git_merge_file_result_free(&result);
}
void test_merge_files__automerge_from_index(void)
{
git_merge_file_result result = {0};
git_index_entry ancestor, ours, theirs;
git_oid_fromstr(&ancestor.id, "6212c31dab5e482247d7977e4f0dd3601decf13b");
ancestor.path = "automergeable.txt";
ancestor.mode = 0100644;
git_oid_fromstr(&ours.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf");
ours.path = "automergeable.txt";
ours.mode = 0100755;
git_oid_fromstr(&theirs.id, "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe");
theirs.path = "newname.txt";
theirs.mode = 0100644;
cl_git_pass(git_merge_file_from_index(&result, repo,
&ancestor, &ours, &theirs, 0));
cl_assert_equal_i(1, result.automergeable);
cl_assert_equal_s("newname.txt", result.path);
cl_assert_equal_i(0100755, result.mode);
cl_assert_equal_i(strlen(AUTOMERGEABLE_MERGED_FILE), result.len);
cl_assert_equal_strn(AUTOMERGEABLE_MERGED_FILE, result.ptr, result.len);
git_merge_file_result_free(&result);
}
tests/merge/merge_helpers.c
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
int merge_trees_from_branches( int merge_trees_from_branches(
git_index **index, git_repository *repo, git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name, const char *ours_name, const char *theirs_name,
git_merge_tree_opts *opts) git_merge_options *opts)
{ {
git_commit *our_commit, *their_commit, *ancestor_commit = NULL; git_commit *our_commit, *their_commit, *ancestor_commit = NULL;
git_tree *our_tree, *their_tree, *ancestor_tree = NULL; git_tree *our_tree, *their_tree, *ancestor_tree = NULL;
...@@ -55,7 +55,7 @@ int merge_trees_from_branches( ...@@ -55,7 +55,7 @@ int merge_trees_from_branches(
int merge_commits_from_branches( int merge_commits_from_branches(
git_index **index, git_repository *repo, git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name, const char *ours_name, const char *theirs_name,
git_merge_tree_opts *opts) git_merge_options *opts)
{ {
git_commit *our_commit, *their_commit; git_commit *our_commit, *their_commit;
git_oid our_oid, their_oid; git_oid our_oid, their_oid;
...@@ -79,7 +79,9 @@ int merge_commits_from_branches( ...@@ -79,7 +79,9 @@ int merge_commits_from_branches(
return 0; return 0;
} }
int merge_branches(git_merge_result **result, git_repository *repo, const char *ours_branch, const char *theirs_branch, git_merge_opts *opts) int merge_branches(git_repository *repo,
const char *ours_branch, const char *theirs_branch,
git_merge_options *merge_opts, git_checkout_options *checkout_opts)
{ {
git_reference *head_ref, *theirs_ref; git_reference *head_ref, *theirs_ref;
git_merge_head *theirs_head; git_merge_head *theirs_head;
...@@ -93,7 +95,7 @@ int merge_branches(git_merge_result **result, git_repository *repo, const char * ...@@ -93,7 +95,7 @@ int merge_branches(git_merge_result **result, git_repository *repo, const char *
cl_git_pass(git_reference_lookup(&theirs_ref, repo, theirs_branch)); cl_git_pass(git_reference_lookup(&theirs_ref, repo, theirs_branch));
cl_git_pass(git_merge_head_from_ref(&theirs_head, repo, theirs_ref)); cl_git_pass(git_merge_head_from_ref(&theirs_head, repo, theirs_ref));
cl_git_pass(git_merge(result, repo, (const git_merge_head **)&theirs_head, 1, opts)); cl_git_pass(git_merge(repo, (const git_merge_head **)&theirs_head, 1, merge_opts, checkout_opts));
git_reference_free(head_ref); git_reference_free(head_ref);
git_reference_free(theirs_ref); git_reference_free(theirs_ref);
......
tests/merge/merge_helpers.h
...@@ -4,6 +4,49 @@ ...@@ -4,6 +4,49 @@
#include "merge.h" #include "merge.h"
#include "git2/merge.h" #include "git2/merge.h"
#define AUTOMERGEABLE_MERGED_FILE \
"this file is changed in master\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is changed in branch\n"
#define AUTOMERGEABLE_MERGED_FILE_CRLF \
"this file is changed in master\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is changed in branch\r\n"
#define CONFLICTING_MERGE_FILE \
"<<<<<<< HEAD\n" \
"this file is changed in master and branch\n" \
"=======\n" \
"this file is changed in branch and master\n" \
">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n"
#define CONFLICTING_DIFF3_FILE \
"<<<<<<< HEAD\n" \
"this file is changed in master and branch\n" \
"||||||| initial\n" \
"this file is a conflict\n" \
"=======\n" \
"this file is changed in branch and master\n" \
">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n"
#define CONFLICTING_UNION_FILE \
"this file is changed in master and branch\n" \
"this file is changed in branch and master\n"
struct merge_index_entry { struct merge_index_entry {
uint16_t mode; uint16_t mode;
char oid_str[41]; char oid_str[41];
...@@ -42,15 +85,16 @@ struct merge_index_conflict_data { ...@@ -42,15 +85,16 @@ struct merge_index_conflict_data {
int merge_trees_from_branches( int merge_trees_from_branches(
git_index **index, git_repository *repo, git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name, const char *ours_name, const char *theirs_name,
git_merge_tree_opts *opts); git_merge_options *opts);
int merge_commits_from_branches( int merge_commits_from_branches(
git_index **index, git_repository *repo, git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name, const char *ours_name, const char *theirs_name,
git_merge_tree_opts *opts); git_merge_options *opts);
int merge_branches(git_merge_result **result, git_repository *repo, int merge_branches(git_repository *repo,
const char *ours_branch, const char *theirs_branch, git_merge_opts *opts); const char *ours_branch, const char *theirs_branch,
git_merge_options *merge_opts, git_checkout_options *checkout_opts);
int merge_test_diff_list(git_merge_diff_list *diff_list, const struct merge_index_entry expected[], size_t expected_len); int merge_test_diff_list(git_merge_diff_list *diff_list, const struct merge_index_entry expected[], size_t expected_len);
......
tests/merge/trees/automerge.c
...@@ -54,28 +54,6 @@ static git_repository *repo; ...@@ -54,28 +54,6 @@ static git_repository *repo;
"", \ "", \
"5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" } "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" }
#define AUTOMERGEABLE_MERGED_FILE \
"this file is changed in master\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is changed in branch\n"
#define AUTOMERGEABLE_MERGED_FILE_CRLF \
"this file is changed in master\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is automergeable\r\n" \
"this file is changed in branch\r\n"
// Fixture setup and teardown // Fixture setup and teardown
void test_merge_trees_automerge__initialize(void) void test_merge_trees_automerge__initialize(void)
{ {
...@@ -91,7 +69,7 @@ void test_merge_trees_automerge__automerge(void) ...@@ -91,7 +69,7 @@ void test_merge_trees_automerge__automerge(void)
{ {
git_index *index; git_index *index;
const git_index_entry *entry; const git_index_entry *entry;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
git_blob *blob; git_blob *blob;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
...@@ -131,7 +109,7 @@ void test_merge_trees_automerge__automerge(void) ...@@ -131,7 +109,7 @@ void test_merge_trees_automerge__automerge(void)
void test_merge_trees_automerge__favor_ours(void) void test_merge_trees_automerge__favor_ours(void)
{ {
git_index *index; git_index *index;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
ADDED_IN_MASTER_INDEX_ENTRY, ADDED_IN_MASTER_INDEX_ENTRY,
...@@ -162,7 +140,7 @@ void test_merge_trees_automerge__favor_ours(void) ...@@ -162,7 +140,7 @@ void test_merge_trees_automerge__favor_ours(void)
void test_merge_trees_automerge__favor_theirs(void) void test_merge_trees_automerge__favor_theirs(void)
{ {
git_index *index; git_index *index;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
ADDED_IN_MASTER_INDEX_ENTRY, ADDED_IN_MASTER_INDEX_ENTRY,
...@@ -193,7 +171,7 @@ void test_merge_trees_automerge__favor_theirs(void) ...@@ -193,7 +171,7 @@ void test_merge_trees_automerge__favor_theirs(void)
void test_merge_trees_automerge__unrelated(void) void test_merge_trees_automerge__unrelated(void)
{ {
git_index *index; git_index *index;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
......
tests/merge/trees/commits.c
...@@ -8,17 +8,6 @@ static git_repository *repo; ...@@ -8,17 +8,6 @@ static git_repository *repo;
#define TEST_REPO_PATH "merge-resolve" #define TEST_REPO_PATH "merge-resolve"
#define AUTOMERGEABLE_MERGED_FILE \
"this file is changed in master\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is automergeable\n" \
"this file is changed in branch\n"
void test_merge_trees_commits__initialize(void) void test_merge_trees_commits__initialize(void)
{ {
repo = cl_git_sandbox_init(TEST_REPO_PATH); repo = cl_git_sandbox_init(TEST_REPO_PATH);
...@@ -33,7 +22,7 @@ void test_merge_trees_commits__automerge(void) ...@@ -33,7 +22,7 @@ void test_merge_trees_commits__automerge(void)
{ {
git_index *index; git_index *index;
const git_index_entry *entry; const git_index_entry *entry;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
git_blob *blob; git_blob *blob;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
...@@ -82,7 +71,7 @@ void test_merge_trees_commits__automerge(void) ...@@ -82,7 +71,7 @@ void test_merge_trees_commits__automerge(void)
void test_merge_trees_commits__no_ancestor(void) void test_merge_trees_commits__no_ancestor(void)
{ {
git_index *index; git_index *index;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
...@@ -109,7 +98,7 @@ void test_merge_trees_commits__no_ancestor(void) ...@@ -109,7 +98,7 @@ void test_merge_trees_commits__no_ancestor(void)
void test_merge_trees_commits__df_conflict(void) void test_merge_trees_commits__df_conflict(void)
{ {
git_index *index; git_index *index;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
{ 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 2, "dir-10" }, { 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 2, "dir-10" },
......
tests/merge/trees/renames.c
...@@ -27,7 +27,7 @@ void test_merge_trees_renames__cleanup(void) ...@@ -27,7 +27,7 @@ void test_merge_trees_renames__cleanup(void)
void test_merge_trees_renames__index(void) void test_merge_trees_renames__index(void)
{ {
git_index *index; git_index *index;
git_merge_tree_opts *opts = NULL; git_merge_options *opts = NULL;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
...@@ -205,7 +205,7 @@ void test_merge_trees_renames__index(void) ...@@ -205,7 +205,7 @@ void test_merge_trees_renames__index(void)
void test_merge_trees_renames__no_rename_index(void) void test_merge_trees_renames__no_rename_index(void)
{ {
git_index *index; git_index *index;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
......
tests/merge/trees/treediff.c
...@@ -44,7 +44,7 @@ static void test_find_differences( ...@@ -44,7 +44,7 @@ static void test_find_differences(
git_oid ancestor_oid, ours_oid, theirs_oid; git_oid ancestor_oid, ours_oid, theirs_oid;
git_tree *ancestor_tree, *ours_tree, *theirs_tree; git_tree *ancestor_tree, *ours_tree, *theirs_tree;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
opts.target_limit = 1000; opts.target_limit = 1000;
opts.rename_threshold = 50; opts.rename_threshold = 50;
......
tests/merge/trees/trivial.c
...@@ -31,7 +31,7 @@ static int merge_trivial(git_index **index, const char *ours, const char *theirs ...@@ -31,7 +31,7 @@ static int merge_trivial(git_index **index, const char *ours, const char *theirs
git_tree *our_tree, *their_tree, *ancestor_tree; git_tree *our_tree, *their_tree, *ancestor_tree;
git_oid our_oid, their_oid, ancestor_oid; git_oid our_oid, their_oid, ancestor_oid;
git_buf branch_buf = GIT_BUF_INIT; git_buf branch_buf = GIT_BUF_INIT;
git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours); git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours);
cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr));
......
tests/merge/workdir/analysis.c 0 → 100644
#include "clar_libgit2.h"
#include "git2/repository.h"
#include "git2/merge.h"
#include "git2/sys/index.h"
#include "merge.h"
#include "../merge_helpers.h"
#include "refs.h"
#include "posix.h"
static git_repository *repo;
static git_index *repo_index;
#define TEST_REPO_PATH "merge-resolve"
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
#define UPTODATE_BRANCH "master"
#define PREVIOUS_BRANCH "previous"
#define FASTFORWARD_BRANCH "ff_branch"
#define FASTFORWARD_ID "fd89f8cffb663ac89095a0f9764902e93ceaca6a"
#define NOFASTFORWARD_BRANCH "branch"
#define NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520"
// Fixture setup and teardown
void test_merge_workdir_analysis__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
git_repository_index(&repo_index, repo);
}
void test_merge_workdir_analysis__cleanup(void)
{
git_index_free(repo_index);
cl_git_sandbox_cleanup();
}
static git_merge_analysis_t analysis_from_branch(const char *branchname)
{
git_buf refname = GIT_BUF_INIT;
git_reference *their_ref;
git_merge_head *their_head;
git_merge_analysis_t analysis;
git_buf_printf(&refname, "%s%s", GIT_REFS_HEADS_DIR, branchname);
cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&refname)));
cl_git_pass(git_merge_head_from_ref(&their_head, repo, their_ref));
cl_git_pass(git_merge_analysis(&analysis, repo, (const git_merge_head **)&their_head, 1));
git_buf_free(&refname);
git_merge_head_free(their_head);
git_reference_free(their_ref);
return analysis;
}
void test_merge_workdir_analysis__fastforward(void)
{
git_merge_analysis_t analysis;
analysis = analysis_from_branch(FASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (analysis & GIT_MERGE_ANALYSIS_NORMAL));
}
void test_merge_workdir_analysis__no_fastforward(void)
{
git_merge_analysis_t analysis;
analysis = analysis_from_branch(NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, analysis);
}
void test_merge_workdir_analysis__uptodate(void)
{
git_merge_analysis_t analysis;
analysis = analysis_from_branch(UPTODATE_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, analysis);
}
void test_merge_workdir_analysis__uptodate_merging_prev_commit(void)
{
git_merge_analysis_t analysis;
analysis = analysis_from_branch(PREVIOUS_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, analysis);
}
void test_merge_workdir_analysis__unborn(void)
{
git_merge_analysis_t analysis;
git_buf master = GIT_BUF_INIT;
git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master");
p_unlink(git_buf_cstr(&master));
analysis = analysis_from_branch(NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, (analysis & GIT_MERGE_ANALYSIS_UNBORN));
git_buf_free(&master);
}
tests/merge/workdir/dirty.c
...@@ -86,19 +86,20 @@ static void set_core_autocrlf_to(git_repository *repo, bool value) ...@@ -86,19 +86,20 @@ static void set_core_autocrlf_to(git_repository *repo, bool value)
git_config_free(cfg); git_config_free(cfg);
} }
static int merge_branch(git_merge_result **result, int merge_file_favor, int checkout_strategy) static int merge_branch(int merge_file_favor, int checkout_strategy)
{ {
git_oid their_oids[1]; git_oid their_oids[1];
git_merge_head *their_heads[1]; git_merge_head *their_heads[1];
git_merge_opts opts = GIT_MERGE_OPTS_INIT; git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
int error; int error;
cl_git_pass(git_oid_fromstr(&their_oids[0], MERGE_BRANCH_OID)); cl_git_pass(git_oid_fromstr(&their_oids[0], MERGE_BRANCH_OID));
cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0])); cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0]));
opts.merge_tree_opts.file_favor = merge_file_favor; merge_opts.file_favor = merge_file_favor;
opts.checkout_opts.checkout_strategy = checkout_strategy; checkout_opts.checkout_strategy = checkout_strategy;
error = git_merge(result, repo, (const git_merge_head **)their_heads, 1, &opts); error = git_merge(repo, (const git_merge_head **)their_heads, 1, &merge_opts, &checkout_opts);
git_merge_head_free(their_heads[0]); git_merge_head_free(their_heads[0]);
...@@ -176,7 +177,6 @@ static void stage_content(char *content[]) ...@@ -176,7 +177,6 @@ static void stage_content(char *content[])
{ {
git_reference *head; git_reference *head;
git_object *head_object; git_object *head_object;
git_merge_result *result = NULL;
git_buf path = GIT_BUF_INIT; git_buf path = GIT_BUF_INIT;
char *filename, *text; char *filename, *text;
size_t i; size_t i;
...@@ -197,7 +197,6 @@ static void stage_content(char *content[]) ...@@ -197,7 +197,6 @@ static void stage_content(char *content[])
cl_git_pass(git_index_add_bypath(repo_index, filename)); cl_git_pass(git_index_add_bypath(repo_index, filename));
} }
git_merge_result_free(result);
git_object_free(head_object); git_object_free(head_object);
git_reference_free(head); git_reference_free(head);
git_buf_free(&path); git_buf_free(&path);
...@@ -207,7 +206,6 @@ static int merge_dirty_files(char *dirty_files[]) ...@@ -207,7 +206,6 @@ static int merge_dirty_files(char *dirty_files[])
{ {
git_reference *head; git_reference *head;
git_object *head_object; git_object *head_object;
git_merge_result *result = NULL;
int error; int error;
cl_git_pass(git_repository_head(&head, repo)); cl_git_pass(git_repository_head(&head, repo));
...@@ -216,9 +214,8 @@ static int merge_dirty_files(char *dirty_files[]) ...@@ -216,9 +214,8 @@ static int merge_dirty_files(char *dirty_files[])
write_files(dirty_files); write_files(dirty_files);
error = merge_branch(&result, 0, 0); error = merge_branch(0, 0);
git_merge_result_free(result);
git_object_free(head_object); git_object_free(head_object);
git_reference_free(head); git_reference_free(head);
...@@ -229,7 +226,6 @@ static int merge_differently_filtered_files(char *files[]) ...@@ -229,7 +226,6 @@ static int merge_differently_filtered_files(char *files[])
{ {
git_reference *head; git_reference *head;
git_object *head_object; git_object *head_object;
git_merge_result *result = NULL;
int error; int error;
cl_git_pass(git_repository_head(&head, repo)); cl_git_pass(git_repository_head(&head, repo));
...@@ -241,9 +237,8 @@ static int merge_differently_filtered_files(char *files[]) ...@@ -241,9 +237,8 @@ static int merge_differently_filtered_files(char *files[])
cl_git_pass(git_index_write(repo_index)); cl_git_pass(git_index_write(repo_index));
error = merge_branch(&result, 0, 0); error = merge_branch(0, 0);
git_merge_result_free(result);
git_object_free(head_object); git_object_free(head_object);
git_reference_free(head); git_reference_free(head);
...@@ -251,17 +246,9 @@ static int merge_differently_filtered_files(char *files[]) ...@@ -251,17 +246,9 @@ static int merge_differently_filtered_files(char *files[])
} }
static int merge_staged_files(char *staged_files[]) static int merge_staged_files(char *staged_files[])
{ {
git_merge_result *result = NULL;
int error;
stage_random_files(staged_files); stage_random_files(staged_files);
return merge_branch(0, 0);
error = merge_branch(&result, 0, 0);
git_merge_result_free(result);
return error;
} }
void test_merge_workdir_dirty__unaffected_dirty_files_allowed(void) void test_merge_workdir_dirty__unaffected_dirty_files_allowed(void)
...@@ -296,7 +283,6 @@ void test_merge_workdir_dirty__staged_files_in_index_disallowed(void) ...@@ -296,7 +283,6 @@ void test_merge_workdir_dirty__staged_files_in_index_disallowed(void)
void test_merge_workdir_dirty__identical_staged_files_allowed(void) void test_merge_workdir_dirty__identical_staged_files_allowed(void)
{ {
git_merge_result *result;
char **content; char **content;
size_t i; size_t i;
...@@ -306,9 +292,7 @@ void test_merge_workdir_dirty__identical_staged_files_allowed(void) ...@@ -306,9 +292,7 @@ void test_merge_workdir_dirty__identical_staged_files_allowed(void)
stage_content(content); stage_content(content);
git_index_write(repo_index); git_index_write(repo_index);
cl_git_pass(merge_branch(&result, 0, 0)); cl_git_pass(merge_branch(0, 0));
git_merge_result_free(result);
} }
} }
......
tests/merge/workdir/fastforward.c deleted 100644 → 0
#include "clar_libgit2.h"
#include "git2/repository.h"
#include "git2/merge.h"
#include "git2/sys/index.h"
#include "merge.h"
#include "../merge_helpers.h"
#include "refs.h"
static git_repository *repo;
static git_index *repo_index;
#define TEST_REPO_PATH "merge-resolve"
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
#define THEIRS_FASTFORWARD_BRANCH "ff_branch"
#define THEIRS_FASTFORWARD_ID "fd89f8cffb663ac89095a0f9764902e93ceaca6a"
#define THEIRS_NOFASTFORWARD_BRANCH "branch"
#define THEIRS_NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520"
// Fixture setup and teardown
void test_merge_workdir_fastforward__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
git_repository_index(&repo_index, repo);
}
void test_merge_workdir_fastforward__cleanup(void)
{
git_index_free(repo_index);
cl_git_sandbox_cleanup();
}
static git_merge_result *merge_fastforward_branch(int flags)
{
git_reference *their_ref;
git_merge_head *their_heads[1];
git_merge_result *result;
git_merge_opts opts = GIT_MERGE_OPTS_INIT;
opts.merge_flags = flags;
cl_git_pass(git_reference_lookup(&their_ref, repo, GIT_REFS_HEADS_DIR THEIRS_FASTFORWARD_BRANCH));
cl_git_pass(git_merge_head_from_ref(&their_heads[0], repo, their_ref));
cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, &opts));
git_merge_head_free(their_heads[0]);
git_reference_free(their_ref);
return result;
}
void test_merge_workdir_fastforward__fastforward(void)
{
git_merge_result *result;
git_oid expected, ff_oid;
cl_git_pass(git_oid_fromstr(&expected, THEIRS_FASTFORWARD_ID));
cl_assert(result = merge_fastforward_branch(0));
cl_assert(git_merge_result_is_fastforward(result));
cl_git_pass(git_merge_result_fastforward_id(&ff_oid, result));
cl_assert(git_oid_cmp(&ff_oid, &expected) == 0);
git_merge_result_free(result);
}
void test_merge_workdir_fastforward__fastforward_only(void)
{
git_merge_result *result;
git_merge_opts opts = GIT_MERGE_OPTS_INIT;
git_reference *their_ref;
git_merge_head *their_head;
int error;
opts.merge_flags = GIT_MERGE_FASTFORWARD_ONLY;
cl_git_pass(git_reference_lookup(&their_ref, repo, GIT_REFS_HEADS_DIR THEIRS_NOFASTFORWARD_BRANCH));
cl_git_pass(git_merge_head_from_ref(&their_head, repo, their_ref));
cl_git_fail((error = git_merge(&result, repo, (const git_merge_head **)&their_head, 1, &opts)));
cl_assert(error == GIT_ENONFASTFORWARD);
git_merge_head_free(their_head);
git_reference_free(their_ref);
}
void test_merge_workdir_fastforward__no_fastforward(void)
{
git_merge_result *result;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
{ 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt" },
{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" },
{ 0100644, "bd9cb4cd0a770cb9adcb5fce212142ef40ea1c35", 0, "changed-in-master.txt" },
{ 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" },
{ 0100644, "364bbe4ce80c7bd31e6307dce77d46e3e1759fb3", 0, "new-in-ff.txt" },
{ 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" },
{ 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" },
};
cl_assert(result = merge_fastforward_branch(GIT_MERGE_NO_FASTFORWARD));
cl_assert(!git_merge_result_is_fastforward(result));
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(git_index_reuc_entrycount(repo_index) == 0);
git_merge_result_free(result);
}
void test_merge_workdir_fastforward__uptodate(void)
{
git_reference *their_ref;
git_merge_head *their_heads[1];
git_merge_result *result;
cl_git_pass(git_reference_lookup(&their_ref, repo, GIT_HEAD_FILE));
cl_git_pass(git_merge_head_from_ref(&their_heads[0], repo, their_ref));
cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, NULL));
cl_assert(git_merge_result_is_uptodate(result));
git_merge_head_free(their_heads[0]);
git_reference_free(their_ref);
git_merge_result_free(result);
}
void test_merge_workdir_fastforward__uptodate_merging_prev_commit(void)
{
git_oid their_oid;
git_merge_head *their_heads[1];
git_merge_result *result;
cl_git_pass(git_oid_fromstr(&their_oid, "c607fc30883e335def28cd686b51f6cfa02b06ec"));
cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oid));
cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, NULL));
cl_assert(git_merge_result_is_uptodate(result));
git_merge_head_free(their_heads[0]);
git_merge_result_free(result);
}
tests/merge/workdir/renames.c
...@@ -34,8 +34,7 @@ void test_merge_workdir_renames__cleanup(void) ...@@ -34,8 +34,7 @@ void test_merge_workdir_renames__cleanup(void)
void test_merge_workdir_renames__renames(void) void test_merge_workdir_renames__renames(void)
{ {
git_merge_result *result; git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_merge_opts opts = GIT_MERGE_OPTS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
...@@ -64,20 +63,18 @@ void test_merge_workdir_renames__renames(void) ...@@ -64,20 +63,18 @@ void test_merge_workdir_renames__renames(void)
{ 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" }, { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" },
}; };
opts.merge_tree_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
opts.merge_tree_opts.rename_threshold = 50; merge_opts.rename_threshold = 50;
cl_git_pass(merge_branches(&result, repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &opts)); cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, NULL));
cl_assert(merge_test_workdir(repo, merge_index_entries, 24)); cl_assert(merge_test_workdir(repo, merge_index_entries, 24));
git_merge_result_free(result);
} }
void test_merge_workdir_renames__ours(void) void test_merge_workdir_renames__ours(void)
{ {
git_index *index; git_index *index;
git_merge_result *result; git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_merge_opts opts = GIT_MERGE_OPTS_INIT; git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
...@@ -102,23 +99,21 @@ void test_merge_workdir_renames__ours(void) ...@@ -102,23 +99,21 @@ void test_merge_workdir_renames__ours(void)
{ 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "7-both-renamed.txt" }, { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "7-both-renamed.txt" },
}; };
opts.merge_tree_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
opts.merge_tree_opts.rename_threshold = 50; merge_opts.rename_threshold = 50;
opts.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS; checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS;
cl_git_pass(merge_branches(&result, repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &opts)); cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, &checkout_opts));
cl_git_pass(git_repository_index(&index, repo)); cl_git_pass(git_repository_index(&index, repo));
cl_git_pass(git_index_write(index)); cl_git_pass(git_index_write(index));
cl_assert(merge_test_workdir(repo, merge_index_entries, 20)); cl_assert(merge_test_workdir(repo, merge_index_entries, 20));
git_merge_result_free(result);
git_index_free(index); git_index_free(index);
} }
void test_merge_workdir_renames__similar(void) void test_merge_workdir_renames__similar(void)
{ {
git_merge_result *result; git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_merge_opts opts = GIT_MERGE_OPTS_INIT;
/* /*
* Note: this differs slightly from the core git merge result - there, 4a is * Note: this differs slightly from the core git merge result - there, 4a is
...@@ -152,12 +147,10 @@ void test_merge_workdir_renames__similar(void) ...@@ -152,12 +147,10 @@ void test_merge_workdir_renames__similar(void)
{ 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" }, { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" },
}; };
opts.merge_tree_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
opts.merge_tree_opts.rename_threshold = 50; merge_opts.rename_threshold = 50;
cl_git_pass(merge_branches(&result, repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &opts)); cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, NULL));
cl_assert(merge_test_workdir(repo, merge_index_entries, 24)); cl_assert(merge_test_workdir(repo, merge_index_entries, 24));
git_merge_result_free(result);
} }
tests/merge/workdir/submodules.c
...@@ -31,8 +31,6 @@ void test_merge_workdir_submodules__automerge(void) ...@@ -31,8 +31,6 @@ void test_merge_workdir_submodules__automerge(void)
git_reference *our_ref, *their_ref; git_reference *our_ref, *their_ref;
git_commit *our_commit; git_commit *our_commit;
git_merge_head *their_head; git_merge_head *their_head;
git_merge_result *result;
git_merge_opts opts = GIT_MERGE_OPTS_INIT;
git_index *index; git_index *index;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
...@@ -51,13 +49,12 @@ void test_merge_workdir_submodules__automerge(void) ...@@ -51,13 +49,12 @@ void test_merge_workdir_submodules__automerge(void)
cl_git_pass(git_reference_lookup(&their_ref, repo, "refs/heads/" SUBMODULE_OTHER_BRANCH)); cl_git_pass(git_reference_lookup(&their_ref, repo, "refs/heads/" SUBMODULE_OTHER_BRANCH));
cl_git_pass(git_merge_head_from_ref(&their_head, repo, their_ref)); cl_git_pass(git_merge_head_from_ref(&their_head, repo, their_ref));
cl_git_pass(git_merge(&result, repo, (const git_merge_head **)&their_head, 1, &opts)); cl_git_pass(git_merge(repo, (const git_merge_head **)&their_head, 1, NULL, NULL));
cl_git_pass(git_repository_index(&index, repo)); cl_git_pass(git_repository_index(&index, repo));
cl_assert(merge_test_index(index, merge_index_entries, 6)); cl_assert(merge_test_index(index, merge_index_entries, 6));
git_index_free(index); git_index_free(index);
git_merge_result_free(result);
git_merge_head_free(their_head); git_merge_head_free(their_head);
git_commit_free(our_commit); git_commit_free(our_commit);
git_reference_free(their_ref); git_reference_free(their_ref);
...@@ -69,8 +66,6 @@ void test_merge_workdir_submodules__take_changed(void) ...@@ -69,8 +66,6 @@ void test_merge_workdir_submodules__take_changed(void)
git_reference *our_ref, *their_ref; git_reference *our_ref, *their_ref;
git_commit *our_commit; git_commit *our_commit;
git_merge_head *their_head; git_merge_head *their_head;
git_merge_result *result;
git_merge_opts opts = GIT_MERGE_OPTS_INIT;
git_index *index; git_index *index;
struct merge_index_entry merge_index_entries[] = { struct merge_index_entry merge_index_entries[] = {
...@@ -87,13 +82,12 @@ void test_merge_workdir_submodules__take_changed(void) ...@@ -87,13 +82,12 @@ void test_merge_workdir_submodules__take_changed(void)
cl_git_pass(git_reference_lookup(&their_ref, repo, "refs/heads/" SUBMODULE_OTHER2_BRANCH)); cl_git_pass(git_reference_lookup(&their_ref, repo, "refs/heads/" SUBMODULE_OTHER2_BRANCH));
cl_git_pass(git_merge_head_from_ref(&their_head, repo, their_ref)); cl_git_pass(git_merge_head_from_ref(&their_head, repo, their_ref));
cl_git_pass(git_merge(&result, repo, (const git_merge_head **)&their_head, 1, &opts)); cl_git_pass(git_merge(repo, (const git_merge_head **)&their_head, 1, NULL, NULL));
cl_git_pass(git_repository_index(&index, repo)); cl_git_pass(git_repository_index(&index, repo));
cl_assert(merge_test_index(index, merge_index_entries, 4)); cl_assert(merge_test_index(index, merge_index_entries, 4));
git_index_free(index); git_index_free(index);
git_merge_result_free(result);
git_merge_head_free(their_head); git_merge_head_free(their_head);
git_commit_free(our_commit); git_commit_free(our_commit);
git_reference_free(their_ref); git_reference_free(their_ref);
......
tests/merge/workdir/trivial.c
...@@ -34,8 +34,6 @@ static int merge_trivial(const char *ours, const char *theirs) ...@@ -34,8 +34,6 @@ static int merge_trivial(const char *ours, const char *theirs)
git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
git_reference *our_ref, *their_ref; git_reference *our_ref, *their_ref;
git_merge_head *their_heads[1]; git_merge_head *their_heads[1];
git_merge_opts opts = GIT_MERGE_OPTS_INIT;
git_merge_result *result;
checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
...@@ -49,13 +47,12 @@ static int merge_trivial(const char *ours, const char *theirs) ...@@ -49,13 +47,12 @@ static int merge_trivial(const char *ours, const char *theirs)
cl_git_pass(git_reference_lookup(&their_ref, repo, branch_buf.ptr)); cl_git_pass(git_reference_lookup(&their_ref, repo, branch_buf.ptr));
cl_git_pass(git_merge_head_from_ref(&their_heads[0], repo, their_ref)); cl_git_pass(git_merge_head_from_ref(&their_heads[0], repo, their_ref));
cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, &opts)); cl_git_pass(git_merge(repo, (const git_merge_head **)their_heads, 1, NULL, NULL));
git_buf_free(&branch_buf); git_buf_free(&branch_buf);
git_reference_free(our_ref); git_reference_free(our_ref);
git_reference_free(their_ref); git_reference_free(their_ref);
git_merge_head_free(their_heads[0]); git_merge_head_free(their_heads[0]);
git_merge_result_free(result);
return 0; return 0;
} }
......
tests/resources/merge-resolve/.gitted/refs/heads/previous 0 → 100644
c607fc30883e335def28cd686b51f6cfa02b06ec
tests/revert/workdir.c
...@@ -398,8 +398,8 @@ void test_revert_workdir__rename_1_of_2(void) ...@@ -398,8 +398,8 @@ void test_revert_workdir__rename_1_of_2(void)
{ 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 2, "file6.txt" }, { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 2, "file6.txt" },
}; };
opts.merge_tree_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; opts.merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
opts.merge_tree_opts.rename_threshold = 50; opts.merge_opts.rename_threshold = 50;
git_oid_fromstr(&head_oid, "cef56612d71a6af8d8015691e4865f7fece905b5"); git_oid_fromstr(&head_oid, "cef56612d71a6af8d8015691e4865f7fece905b5");
cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); cl_git_pass(git_commit_lookup(&head, repo, &head_oid));
...@@ -432,8 +432,8 @@ void test_revert_workdir__rename(void) ...@@ -432,8 +432,8 @@ void test_revert_workdir__rename(void)
{ "file4.txt", "file5.txt", "" }, { "file4.txt", "file5.txt", "" },
}; };
opts.merge_tree_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; opts.merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
opts.merge_tree_opts.rename_threshold = 50; opts.merge_opts.rename_threshold = 50;
git_oid_fromstr(&head_oid, "55568c8de5322ff9a95d72747a239cdb64a19965"); git_oid_fromstr(&head_oid, "55568c8de5322ff9a95d72747a239cdb64a19965");
cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); cl_git_pass(git_commit_lookup(&head, repo, &head_oid));
......
tests/structinit/structinit.c
...@@ -65,15 +65,20 @@ void test_structinit_structinit__compare(void) ...@@ -65,15 +65,20 @@ void test_structinit_structinit__compare(void)
git_diff_find_options, GIT_DIFF_FIND_OPTIONS_VERSION, \ git_diff_find_options, GIT_DIFF_FIND_OPTIONS_VERSION, \
GIT_DIFF_FIND_OPTIONS_INIT, git_diff_find_init_options); GIT_DIFF_FIND_OPTIONS_INIT, git_diff_find_init_options);
/* merge_tree */ /* merge_file_input */
CHECK_MACRO_FUNC_INIT_EQUAL( \
git_merge_file_input, GIT_MERGE_FILE_INPUT_VERSION, \
GIT_MERGE_FILE_INPUT_INIT, git_merge_file_init_input);
/* merge_file */
CHECK_MACRO_FUNC_INIT_EQUAL( \ CHECK_MACRO_FUNC_INIT_EQUAL( \
git_merge_tree_opts, GIT_MERGE_TREE_OPTS_VERSION, \ git_merge_file_options, GIT_MERGE_FILE_OPTIONS_VERSION, \
GIT_MERGE_TREE_OPTS_INIT, git_merge_tree_init_opts); GIT_MERGE_FILE_OPTIONS_INIT, git_merge_file_init_options);
/* merge */ /* merge_tree */
CHECK_MACRO_FUNC_INIT_EQUAL( \ CHECK_MACRO_FUNC_INIT_EQUAL( \
git_merge_opts, GIT_MERGE_OPTS_VERSION, \ git_merge_options, GIT_MERGE_OPTIONS_VERSION, \
GIT_MERGE_OPTS_INIT, git_merge_init_opts); GIT_MERGE_OPTIONS_INIT, git_merge_init_options);
/* push */ /* push */
CHECK_MACRO_FUNC_INIT_EQUAL( \ CHECK_MACRO_FUNC_INIT_EQUAL( \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment