git svn mergeinfo tests: modernize redirection & quoting style
Use "<file" instead of "< file", and don't put the closing quote for strings on an indented line. This makes a follow-up refactoring commit easier to read. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jan 23, 2021 at 14:00 UTC
4669917e8f20c047974ee162c5ec3b28bb6016c3
1 file changed
+8
-8
t/t9151-svn-mergeinfo.sh
+8
-8
@@ -9,37 +9,37 @@ test_description='git-svn svn mergeinfo properties'
9
10
test_expect_success 'load svn dump' "
11
svnadmin load -q '$rawsvnrepo' \
12
- < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
12
+ <'$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
13
git svn init --minimize-url -R svnmerge \
14
--rewrite-root=http://svn.example.org \
15
-T trunk -b branches '$svnrepo' &&
16
git svn fetch --all
17
- "
17
+"
18
19
test_expect_success 'all svn merges became git merge commits' '
20
unmarked=$(git rev-list --parents --all --grep=Merge |
21
grep -v " .* " | cut -f1 -d" ") &&
22
[ -z "$unmarked" ]
23
- '
23
+'
24
25
test_expect_success 'cherry picks did not become git merge commits' '
26
bad_cherries=$(git rev-list --parents --all --grep=Cherry |
27
grep " .* " | cut -f1 -d" ") &&
28
[ -z "$bad_cherries" ]
29
- '
29
+'
30
31
test_expect_success 'svn non-merge merge commits did not become git merge commits' '
32
bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
33
grep " .* " | cut -f1 -d" ") &&
34
[ -z "$bad_non_merges" ]
35
- '
35
+'
36
37
test_expect_success 'commit made to merged branch is reachable from the merge' '
38
before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
39
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
40
not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
41
[ -z "$not_reachable" ]
42
- '
42
+'
43
44
test_expect_success 'merging two branches in one commit is detected correctly' '
45
f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
@@ -47,11 +47,11 @@ test_expect_success 'merging two branches in one commit is detected correctly' '
47
merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
48
not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
49
[ -z "$not_reachable" ]
50
- '
50
+'
51
52
test_expect_failure 'everything got merged in the end' '
53
unmerged=$(git rev-list --all --not master) &&
54
[ -z "$unmerged" ]
55
- '
55
+'
56
57
test_done