Skip to content

G
git2
Unverified Commit 0c1029be by Patrick Steinhardt Committed by GitHub
Options

Merge pull request #5022 from rcoup/merge-analysis-bare-repo-5017 

Merge analysis support for bare repos
parents 758d1b9c 438c9958
Showing with 301 additions and 115 deletions
src/merge.c
...@@ -3112,9 +3112,6 @@ static int merge_heads( ...@@ -3112,9 +3112,6 @@ static int merge_heads(
*ancestor_head_out = NULL; *ancestor_head_out = NULL;
*our_head_out = NULL; *our_head_out = NULL;
if ((error = git_repository__ensure_not_bare(repo, "merge")) < 0)
goto done;
if ((error = git_annotated_commit_from_ref(&our_head, repo, our_ref)) < 0) if ((error = git_annotated_commit_from_ref(&our_head, repo, our_ref)) < 0)
goto done; goto done;
......
tests/merge/analysis.c 0 → 100644
/*
NOTE: this is the implementation for both merge/trees/analysis.c and merge/workdir/analysis.c
You probably want to make changes to both files.
*/
#include "clar_libgit2.h"
#include "git2/repository.h"
#include "git2/merge.h"
#include "git2/annotated_commit.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 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 testimpl_merge_analysis__initialize(git_repository *t_repo, git_index *t_repo_index)
{
repo = t_repo;
repo_index = t_repo_index;
}
void testimpl_merge_analysis__cleanup(void)
{
repo_index = NULL;
repo = NULL;
}
static void analysis_from_branch(
git_merge_analysis_t *merge_analysis,
git_merge_preference_t *merge_pref,
const char *our_branchname,
const char *their_branchname)
{
git_buf our_refname = GIT_BUF_INIT;
git_buf their_refname = GIT_BUF_INIT;
git_reference *our_ref;
git_reference *their_ref;
git_annotated_commit *their_head;
if (our_branchname != NULL) {
cl_git_pass(git_buf_printf(&our_refname, "%s%s", GIT_REFS_HEADS_DIR, our_branchname));
cl_git_pass(git_reference_lookup(&our_ref, repo, git_buf_cstr(&our_refname)));
} else {
cl_git_pass(git_reference_lookup(&our_ref, repo, GIT_HEAD_FILE));
}
cl_git_pass(git_buf_printf(&their_refname, "%s%s", GIT_REFS_HEADS_DIR, their_branchname));
cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&their_refname)));
cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref));
cl_git_pass(git_merge_analysis_for_ref(merge_analysis, merge_pref, repo, our_ref, (const git_annotated_commit **)&their_head, 1));
git_buf_dispose(&our_refname);
git_buf_dispose(&their_refname);
git_annotated_commit_free(their_head);
git_reference_free(our_ref);
git_reference_free(their_ref);
}
void testimpl_merge_analysis__fastforward(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
}
void testimpl_merge_analysis__no_fastforward(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
}
void testimpl_merge_analysis__uptodate(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, UPTODATE_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
void testimpl_merge_analysis__uptodate_merging_prev_commit(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, PREVIOUS_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
void testimpl_merge_analysis__unborn(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
git_buf master = GIT_BUF_INIT;
cl_git_pass(git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master"));
p_unlink(git_buf_cstr(&master));
analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD|GIT_MERGE_ANALYSIS_UNBORN, merge_analysis);
git_buf_dispose(&master);
}
void testimpl_merge_analysis__fastforward_with_config_noff(void)
{
git_config *config;
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
cl_git_pass(git_repository_config(&config, repo));
cl_git_pass(git_config_set_string(config, "merge.ff", "false"));
analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
cl_assert_equal_i(GIT_MERGE_PREFERENCE_NO_FASTFORWARD, (merge_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD));
git_config_free(config);
}
void testimpl_merge_analysis__no_fastforward_with_config_ffonly(void)
{
git_config *config;
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
cl_git_pass(git_repository_config(&config, repo));
cl_git_pass(git_config_set_string(config, "merge.ff", "only"));
analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
cl_assert_equal_i(GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY, (merge_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY));
git_config_free(config);
}
void testimpl_merge_analysis__between_uptodate_refs(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH, PREVIOUS_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
void testimpl_merge_analysis__between_noff_refs(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, "branch", FASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
}
tests/merge/analysis.h 0 → 100644
#ifndef INCLUDE_cl_merge_analysis_h__
#define INCLUDE_cl_merge_analysis_h__
void testimpl_merge_analysis__initialize(git_repository *t_repo, git_index *t_repo_index);
void testimpl_merge_analysis__cleanup(void);
void testimpl_merge_analysis__fastforward(void);
void testimpl_merge_analysis__no_fastforward(void);
void testimpl_merge_analysis__uptodate(void);
void testimpl_merge_analysis__uptodate_merging_prev_commit(void);
void testimpl_merge_analysis__unborn(void);
void testimpl_merge_analysis__fastforward_with_config_noff(void);
void testimpl_merge_analysis__no_fastforward_with_config_ffonly(void);
void testimpl_merge_analysis__between_uptodate_refs(void);
void testimpl_merge_analysis__between_noff_refs(void);
#endif
tests/merge/trees/analysis.c 0 → 100644
/*
NOTE: this is essentially duplicated from tests/merge/workdir/analysis.c
You probably want to make changes to both files.
*/
#include "clar_libgit2.h"
#include "git2/repository.h"
#include "../analysis.h"
static git_repository *repo;
static git_repository *bare_repo;
static git_index *repo_index;
#define TEST_REPO_PATH "merge-resolve"
#define TEST_INDEX_PATH TEST_REPO_PATH "/index"
/* Fixture setup and teardown */
void test_merge_trees_analysis__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
cl_git_pass(git_repository_open_ext(&bare_repo, TEST_REPO_PATH "/.git", GIT_REPOSITORY_OPEN_BARE, NULL));
git_repository_index(&repo_index, bare_repo);
testimpl_merge_analysis__initialize(bare_repo, repo_index);
}
void test_merge_trees_analysis__cleanup(void)
{
testimpl_merge_analysis__cleanup();
git_index_free(repo_index);
repo_index = NULL;
git_repository_free(bare_repo);
bare_repo = NULL;
cl_git_sandbox_cleanup();
repo = NULL;
}
void test_merge_trees_analysis__fastforward(void)
{
testimpl_merge_analysis__fastforward();
}
void test_merge_trees_analysis__no_fastforward(void)
{
testimpl_merge_analysis__no_fastforward();
}
void test_merge_trees_analysis__uptodate(void)
{
testimpl_merge_analysis__uptodate();
}
void test_merge_trees_analysis__uptodate_merging_prev_commit(void)
{
testimpl_merge_analysis__uptodate_merging_prev_commit();
}
void test_merge_trees_analysis__unborn(void)
{
testimpl_merge_analysis__unborn();
}
void test_merge_trees_analysis__fastforward_with_config_noff(void)
{
testimpl_merge_analysis__fastforward_with_config_noff();
}
void test_merge_trees_analysis__no_fastforward_with_config_ffonly(void)
{
testimpl_merge_analysis__no_fastforward_with_config_ffonly();
}
void test_merge_trees_analysis__between_uptodate_refs(void)
{
testimpl_merge_analysis__between_uptodate_refs();
}
void test_merge_trees_analysis__between_noff_refs(void)
{
testimpl_merge_analysis__between_noff_refs();
}
tests/merge/workdir/analysis.c
/*
NOTE: this is essentially duplicated with tests/merge/trees/analysis.c
You probably want to make changes to both files.
*/
#include "clar_libgit2.h" #include "clar_libgit2.h"
#include "git2/repository.h" #include "git2/repository.h"
#include "git2/merge.h" #include "../analysis.h"
#include "git2/annotated_commit.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_repository *repo;
static git_index *repo_index; static git_index *repo_index;
...@@ -14,157 +13,68 @@ static git_index *repo_index; ...@@ -14,157 +13,68 @@ static git_index *repo_index;
#define TEST_REPO_PATH "merge-resolve" #define TEST_REPO_PATH "merge-resolve"
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" #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 */ /* Fixture setup and teardown */
void test_merge_workdir_analysis__initialize(void) void test_merge_workdir_analysis__initialize(void)
{ {
repo = cl_git_sandbox_init(TEST_REPO_PATH); repo = cl_git_sandbox_init(TEST_REPO_PATH);
git_repository_index(&repo_index, repo); git_repository_index(&repo_index, repo);
testimpl_merge_analysis__initialize(repo, repo_index);
} }
void test_merge_workdir_analysis__cleanup(void) void test_merge_workdir_analysis__cleanup(void)
{ {
testimpl_merge_analysis__cleanup();
git_index_free(repo_index); git_index_free(repo_index);
cl_git_sandbox_cleanup(); repo_index = NULL;
}
static void analysis_from_branch( cl_git_sandbox_cleanup();
git_merge_analysis_t *merge_analysis, repo = NULL;
git_merge_preference_t *merge_pref,
const char *our_branchname,
const char *their_branchname)
{
git_buf our_refname = GIT_BUF_INIT;
git_buf their_refname = GIT_BUF_INIT;
git_reference *our_ref;
git_reference *their_ref;
git_annotated_commit *their_head;
if (our_branchname != NULL) {
cl_git_pass(git_buf_printf(&our_refname, "%s%s", GIT_REFS_HEADS_DIR, our_branchname));
cl_git_pass(git_reference_lookup(&our_ref, repo, git_buf_cstr(&our_refname)));
} else {
cl_git_pass(git_reference_lookup(&our_ref, repo, GIT_HEAD_FILE));
}
cl_git_pass(git_buf_printf(&their_refname, "%s%s", GIT_REFS_HEADS_DIR, their_branchname));
cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&their_refname)));
cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref));
cl_git_pass(git_merge_analysis_for_ref(merge_analysis, merge_pref, repo, our_ref, (const git_annotated_commit **)&their_head, 1));
git_buf_dispose(&our_refname);
git_buf_dispose(&their_refname);
git_annotated_commit_free(their_head);
git_reference_free(our_ref);
git_reference_free(their_ref);
} }
void test_merge_workdir_analysis__fastforward(void) void test_merge_workdir_analysis__fastforward(void)
{ {
git_merge_analysis_t merge_analysis; testimpl_merge_analysis__fastforward();
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
} }
void test_merge_workdir_analysis__no_fastforward(void) void test_merge_workdir_analysis__no_fastforward(void)
{ {
git_merge_analysis_t merge_analysis; testimpl_merge_analysis__no_fastforward();
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
} }
void test_merge_workdir_analysis__uptodate(void) void test_merge_workdir_analysis__uptodate(void)
{ {
git_merge_analysis_t merge_analysis; testimpl_merge_analysis__uptodate();
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, UPTODATE_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
} }
void test_merge_workdir_analysis__uptodate_merging_prev_commit(void) void test_merge_workdir_analysis__uptodate_merging_prev_commit(void)
{ {
git_merge_analysis_t merge_analysis; testimpl_merge_analysis__uptodate_merging_prev_commit();
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NULL, PREVIOUS_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
} }
void test_merge_workdir_analysis__unborn(void) void test_merge_workdir_analysis__unborn(void)
{ {
git_merge_analysis_t merge_analysis; testimpl_merge_analysis__unborn();
git_merge_preference_t merge_pref;
git_buf master = GIT_BUF_INIT;
git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master");
p_unlink(git_buf_cstr(&master));
analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD|GIT_MERGE_ANALYSIS_UNBORN, merge_analysis);
git_buf_dispose(&master);
} }
void test_merge_workdir_analysis__fastforward_with_config_noff(void) void test_merge_workdir_analysis__fastforward_with_config_noff(void)
{ {
git_config *config; testimpl_merge_analysis__fastforward_with_config_noff();
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
git_repository_config(&config, repo);
git_config_set_string(config, "merge.ff", "false");
analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
cl_assert_equal_i(GIT_MERGE_PREFERENCE_NO_FASTFORWARD, (merge_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD));
} }
void test_merge_workdir_analysis__no_fastforward_with_config_ffonly(void) void test_merge_workdir_analysis__no_fastforward_with_config_ffonly(void)
{ {
git_config *config; testimpl_merge_analysis__no_fastforward_with_config_ffonly();
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
git_repository_config(&config, repo);
git_config_set_string(config, "merge.ff", "only");
analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
cl_assert_equal_i(GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY, (merge_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY));
} }
void test_merge_workdir_analysis__between_uptodate_refs(void) void test_merge_workdir_analysis__between_uptodate_refs(void)
{ {
git_merge_analysis_t merge_analysis; testimpl_merge_analysis__between_uptodate_refs();
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH, PREVIOUS_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
} }
void test_merge_workdir_analysis__between_noff_refs(void) void test_merge_workdir_analysis__between_noff_refs(void)
{ {
git_merge_analysis_t merge_analysis; testimpl_merge_analysis__between_noff_refs();
git_merge_preference_t merge_pref;
analysis_from_branch(&merge_analysis, &merge_pref, "branch", FASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
} }
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