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
|
<?xml version="1.0"?>
<project name="gitMergeTest" default="invalid">
<import file="GitTestFunction.xml"/>
<target name="invalid">
<fail>This file should only be run via a testcase</fail>
</target>
<target name="allParamsSet" description="all parameters present">
<gitclone gitPath="${git-path}"
singleBranch="true"
repository="${repo.dir.resolved}"
targetPath="${tmp.dir.resolved}" />
<!-- create couple of test branches -->
<gitbranch gitPath="${git-path}"
repository="${tmp.dir.resolved}"
branchname="merge-test-1" startpoint="origin/master" />
<gitbranch gitPath="${git-path}"
repository="${tmp.dir.resolved}"
branchname="merge-test-2" startpoint="origin/master" />
<gitmerge gitPath="${git-path}"
repository="${tmp.dir.resolved}"
remote="merge-test-1 merge-test-2"
message="merging repos" commit="true"/>
</target>
<target name="noRepository" description="Required param checking">
<gitmerge gitPath="${git-path}" />
</target>
<target name="noRemotes" description="Required param checking">
<gitmerge gitPath="${git-path}" repository="${tmp.dir.resolved}" remote="" />
</target>
<target name="wrongStrategySet" description="git-merge --strategy">
<gitclone gitPath="${git-path}"
singleBranch="true"
repository="${repo.dir.resolved}"
targetPath="${tmp.dir.resolved}" />
<!-- create couple of test branches -->
<gitbranch gitPath="${git-path}"
repository="${tmp.dir.resolved}"
branchname="merge-test-1" startpoint="origin/master" />
<gitmerge gitPath="${git-path}"
repository="${tmp.dir.resolved}"
remote="merge-test-1"
strategy="plain-wrong" quiet="true" />
</target>
<target name="strategySet" description="git-merge --strategy">
<gitclone gitPath="${git-path}"
singleBranch="true"
repository="${repo.dir.resolved}"
targetPath="${tmp.dir.resolved}" />
<!-- create couple of test branches -->
<gitbranch gitPath="${git-path}"
repository="${tmp.dir.resolved}"
branchname="merge-test-1" startpoint="origin/master" />
<gitmerge gitPath="${git-path}"
repository="${tmp.dir.resolved}"
remote="merge-test-1"
strategy="recursive" />
</target>
<target name="remoteSet" description="git-merge commit">
<gitclone gitPath="${git-path}"
singleBranch="true"
repository="${repo.dir.resolved}"
targetPath="${tmp.dir.resolved}" />
<!-- create couple of test branches -->
<gitbranch gitPath="${git-path}"
repository="${tmp.dir.resolved}"
branchname="merge-test-1" startpoint="origin/master" />
<gitmerge gitPath="${git-path}"
repository="${tmp.dir.resolved}"
remote="6dbaf4508e75dcd426b5b974a67c462c70d46e1f" />
</target>
<target name="fastForwardCommitSet" description="git-merge --no-ff">
<gitclone gitPath="${git-path}"
singleBranch="true"
repository="${repo.dir.resolved}"
targetPath="${tmp.dir.resolved}" />
<gitbranch gitPath="${git-path}"
repository="${tmp.dir.resolved}"
branchname="merge-test-1" startpoint="6dbaf4508e75dcd426b5b974a67c462c70d46e1f" />
<gitcheckout gitPath="${git-path}"
repository="${tmp.dir.resolved}"
branchname="merge-test-1" quiet="true" />
<gitmerge gitPath="${git-path}"
fastForwardCommit="true"
repository="${tmp.dir.resolved}"
remote="origin/master" />
<gitlog gitPath="${git-path}"
format="oneline"
maxCount="2"
stat="true"
repository="${tmp.dir.resolved}" />
</target>
<target name="noCommitSet" description="git-merge --no-commit">
<gitclone
singleBranch="true"
repository="${repo.dir.resolved}"
targetPath="${tmp.dir.resolved}" />
<!-- create couple of test branches -->
<gitbranch
repository="${tmp.dir.resolved}"
branchname="merge-test-1" startpoint="origin/master" />
<gitmerge
repository="${tmp.dir.resolved}"
remote="6dbaf4508e75dcd426b5b974a67c462c70d46e1f" nocommit="true" />
</target>
</project>
|
