blob: 28fc39302dc8a8fb53a51cf2ad87d1a274e29bc3 (
plain)
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
|
// 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 "git2/repository.h"
#include "../analysis.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"
/* 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);
testimpl_merge_analysis__initialize(repo, repo_index);
}
void test_merge_workdir_analysis__cleanup(void)
{
testimpl_merge_analysis__cleanup();
git_index_free(repo_index);
cl_git_sandbox_cleanup();
}
void test_merge_workdir_analysis__fastforward(void)
{
testimpl_merge_analysis__fastforward();
}
void test_merge_workdir_analysis__no_fastforward(void)
{
testimpl_merge_analysis__no_fastforward();
}
void test_merge_workdir_analysis__uptodate(void)
{
testimpl_merge_analysis__uptodate();
}
void test_merge_workdir_analysis__uptodate_merging_prev_commit(void)
{
testimpl_merge_analysis__uptodate_merging_prev_commit();
}
void test_merge_workdir_analysis__unborn(void)
{
testimpl_merge_analysis__unborn();
}
void test_merge_workdir_analysis__fastforward_with_config_noff(void)
{
testimpl_merge_analysis__fastforward_with_config_noff();
}
void test_merge_workdir_analysis__no_fastforward_with_config_ffonly(void)
{
testimpl_merge_analysis__no_fastforward_with_config_ffonly();
}
void test_merge_workdir_analysis__between_uptodate_refs(void)
{
testimpl_merge_analysis__between_uptodate_refs();
}
void test_merge_workdir_analysis__between_noff_refs(void)
{
testimpl_merge_analysis__between_noff_refs();
}
|