@@ -9,49 +9,49 @@ test_description='git-svn svn mergeinfo properties'
9
9
10
10
test_expect_success ' load svn dump' "
11
11
svnadmin load -q '$rawsvnrepo ' \
12
- < '$TEST_DIRECTORY /t9151/svn-mergeinfo.dump' &&
12
+ <'$TEST_DIRECTORY /t9151/svn-mergeinfo.dump' &&
13
13
git svn init --minimize-url -R svnmerge \
14
14
--rewrite-root=http://svn.example.org \
15
15
-T trunk -b branches '$svnrepo ' &&
16
16
git svn fetch --all
17
- "
17
+ "
18
18
19
19
test_expect_success ' all svn merges became git merge commits' '
20
20
unmarked=$(git rev-list --parents --all --grep=Merge |
21
21
grep -v " .* " | cut -f1 -d" ") &&
22
22
[ -z "$unmarked" ]
23
- '
23
+ '
24
24
25
25
test_expect_success ' cherry picks did not become git merge commits' '
26
26
bad_cherries=$(git rev-list --parents --all --grep=Cherry |
27
27
grep " .* " | cut -f1 -d" ") &&
28
28
[ -z "$bad_cherries" ]
29
- '
29
+ '
30
30
31
31
test_expect_success ' svn non-merge merge commits did not become git merge commits' '
32
32
bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
33
33
grep " .* " | cut -f1 -d" ") &&
34
34
[ -z "$bad_non_merges" ]
35
- '
35
+ '
36
36
37
37
test_expect_success ' commit made to merged branch is reachable from the merge' '
38
38
before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
39
39
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
40
40
not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
41
41
[ -z "$not_reachable" ]
42
- '
42
+ '
43
43
44
44
test_expect_success ' merging two branches in one commit is detected correctly' '
45
45
f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
46
46
f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
47
47
merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
48
48
not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
49
49
[ -z "$not_reachable" ]
50
- '
50
+ '
51
51
52
52
test_expect_failure ' everything got merged in the end' '
53
53
unmerged=$(git rev-list --all --not master) &&
54
54
[ -z "$unmerged" ]
55
- '
55
+ '
56
56
57
57
test_done
0 commit comments