Skip to content

Commit 4669917

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ef83970 commit 4669917

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

t/t9151-svn-mergeinfo.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,49 @@ test_description='git-svn svn mergeinfo properties'
99

1010
test_expect_success 'load svn dump' "
1111
svnadmin load -q '$rawsvnrepo' \
12-
< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
12+
<'$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
1313
git svn init --minimize-url -R svnmerge \
1414
--rewrite-root=http://svn.example.org \
1515
-T trunk -b branches '$svnrepo' &&
1616
git svn fetch --all
17-
"
17+
"
1818

1919
test_expect_success 'all svn merges became git merge commits' '
2020
unmarked=$(git rev-list --parents --all --grep=Merge |
2121
grep -v " .* " | cut -f1 -d" ") &&
2222
[ -z "$unmarked" ]
23-
'
23+
'
2424

2525
test_expect_success 'cherry picks did not become git merge commits' '
2626
bad_cherries=$(git rev-list --parents --all --grep=Cherry |
2727
grep " .* " | cut -f1 -d" ") &&
2828
[ -z "$bad_cherries" ]
29-
'
29+
'
3030

3131
test_expect_success 'svn non-merge merge commits did not become git merge commits' '
3232
bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
3333
grep " .* " | cut -f1 -d" ") &&
3434
[ -z "$bad_non_merges" ]
35-
'
35+
'
3636

3737
test_expect_success 'commit made to merged branch is reachable from the merge' '
3838
before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
3939
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
4040
not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
4141
[ -z "$not_reachable" ]
42-
'
42+
'
4343

4444
test_expect_success 'merging two branches in one commit is detected correctly' '
4545
f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
4646
f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
4747
merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
4848
not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
4949
[ -z "$not_reachable" ]
50-
'
50+
'
5151

5252
test_expect_failure 'everything got merged in the end' '
5353
unmerged=$(git rev-list --all --not master) &&
5454
[ -z "$unmerged" ]
55-
'
55+
'
5656

5757
test_done

0 commit comments

Comments
 (0)