Skip to content

Commit 838bdd1

Browse files
committed
Update expected test data for git 2.35
Commit order from fast-export --first-parent has changed in git 2.35, see git/git@726a228 This will break the same tests on older git releases. Fixes: newren#344 Signed-off-by: Stefano Rivera <[email protected]>
1 parent fff5f43 commit 838bdd1

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

t/t9390/less-empty-keepme

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@ feature done
22
reset refs/heads/master
33
commit refs/heads/master
44
mark :1
5-
author Full Name <[email protected]> 1000020000 +0100
6-
committer Full Name <[email protected]> 1000020000 +0100
5+
author Full Name <[email protected]> 1000000000 +0100
6+
committer Full Name <[email protected]> 1000000000 +0100
77
data 2
8-
C
8+
A
99

1010
commit refs/heads/master
1111
mark :2
12-
author Full Name <[email protected]> 1000030000 +0100
13-
committer Full Name <[email protected]> 1000030000 +0100
12+
author Full Name <[email protected]> 1000010000 +0100
13+
committer Full Name <[email protected]> 1000010000 +0100
1414
data 2
15-
D
15+
B
1616
from :1
1717

1818
reset refs/heads/master
1919
commit refs/heads/master
2020
mark :3
21-
author Full Name <[email protected]> 1000000000 +0100
22-
committer Full Name <[email protected]> 1000000000 +0100
21+
author Full Name <[email protected]> 1000020000 +0100
22+
committer Full Name <[email protected]> 1000020000 +0100
2323
data 2
24-
A
24+
C
2525

2626
commit refs/heads/master
2727
mark :4
28-
author Full Name <[email protected]> 1000010000 +0100
29-
committer Full Name <[email protected]> 1000010000 +0100
28+
author Full Name <[email protected]> 1000030000 +0100
29+
committer Full Name <[email protected]> 1000030000 +0100
3030
data 2
31-
B
31+
D
3232
from :3
3333

3434
blob
@@ -42,8 +42,8 @@ author Full Name <[email protected]> 1000040000 +0100
4242
committer Full Name <[email protected]> 1000040000 +0100
4343
data 29
4444
E: Merge commit 'D' into 'B'
45-
from :4
46-
merge :2
45+
from :2
46+
merge :4
4747
M 100644 :5 keepme
4848

4949
commit refs/heads/master
@@ -68,8 +68,8 @@ author Full Name <[email protected]> 1000050000 +0100
6868
committer Full Name <[email protected]> 1000050000 +0100
6969
data 29
7070
F: Merge commit 'D' into 'B'
71-
from :4
72-
merge :2
71+
from :2
72+
merge :4
7373

7474
blob
7575
mark :10

t/t9390/more-empty-keepme

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@ feature done
22
blob
33
mark :1
44
data 10
5-
keepme v2
5+
keepme v1
66

77
reset refs/heads/master
88
commit refs/heads/master
99
mark :2
10-
author Full Name <[email protected]> 1000080000 +0100
11-
committer Full Name <[email protected]> 1000080000 +0100
12-
data 2
13-
I
10+
author Full Name <[email protected]> 1000040000 +0100
11+
committer Full Name <[email protected]> 1000040000 +0100
12+
data 29
13+
E: Merge commit 'D' into 'B'
1414
M 100644 :1 keepme
1515

1616
blob
1717
mark :3
1818
data 10
19-
keepme v1
19+
keepme v2
2020

2121
reset refs/heads/master
2222
commit refs/heads/master
2323
mark :4
24-
author Full Name <[email protected]> 1000040000 +0100
25-
committer Full Name <[email protected]> 1000040000 +0100
26-
data 29
27-
E: Merge commit 'D' into 'B'
24+
author Full Name <[email protected]> 1000080000 +0100
25+
committer Full Name <[email protected]> 1000080000 +0100
26+
data 2
27+
I
2828
M 100644 :3 keepme
2929

3030
commit refs/heads/master
@@ -33,7 +33,7 @@ author Full Name <[email protected]> 1000090000 +0100
3333
committer Full Name <[email protected]> 1000090000 +0100
3434
data 29
3535
J: Merge commit 'I' into 'H'
36-
from :4
37-
merge :2
36+
from :2
37+
merge :4
3838

3939
done

0 commit comments

Comments
 (0)