Update expected test data for git 2.35

Commit order from fast-export --first-parent has changed in git 2.35,
see 726a228dfb

This will break the same tests on older git releases.

Fixes: #344
Signed-off-by: Stefano Rivera <stefano@rivera.za.net>
pull/352/head
Stefano Rivera 2 years ago
parent fff5f43a15
commit 838bdd19f6

@ -2,33 +2,33 @@ feature done
reset refs/heads/master reset refs/heads/master
commit refs/heads/master commit refs/heads/master
mark :1 mark :1
author Full Name <user@organization.tld> 1000020000 +0100 author Full Name <user@organization.tld> 1000000000 +0100
committer Full Name <user@organization.tld> 1000020000 +0100 committer Full Name <user@organization.tld> 1000000000 +0100
data 2 data 2
C A
commit refs/heads/master commit refs/heads/master
mark :2 mark :2
author Full Name <user@organization.tld> 1000030000 +0100 author Full Name <user@organization.tld> 1000010000 +0100
committer Full Name <user@organization.tld> 1000030000 +0100 committer Full Name <user@organization.tld> 1000010000 +0100
data 2 data 2
D B
from :1 from :1
reset refs/heads/master reset refs/heads/master
commit refs/heads/master commit refs/heads/master
mark :3 mark :3
author Full Name <user@organization.tld> 1000000000 +0100 author Full Name <user@organization.tld> 1000020000 +0100
committer Full Name <user@organization.tld> 1000000000 +0100 committer Full Name <user@organization.tld> 1000020000 +0100
data 2 data 2
A C
commit refs/heads/master commit refs/heads/master
mark :4 mark :4
author Full Name <user@organization.tld> 1000010000 +0100 author Full Name <user@organization.tld> 1000030000 +0100
committer Full Name <user@organization.tld> 1000010000 +0100 committer Full Name <user@organization.tld> 1000030000 +0100
data 2 data 2
B D
from :3 from :3
blob blob
@ -42,8 +42,8 @@ author Full Name <user@organization.tld> 1000040000 +0100
committer Full Name <user@organization.tld> 1000040000 +0100 committer Full Name <user@organization.tld> 1000040000 +0100
data 29 data 29
E: Merge commit 'D' into 'B' E: Merge commit 'D' into 'B'
from :4 from :2
merge :2 merge :4
M 100644 :5 keepme M 100644 :5 keepme
commit refs/heads/master commit refs/heads/master
@ -68,8 +68,8 @@ author Full Name <user@organization.tld> 1000050000 +0100
committer Full Name <user@organization.tld> 1000050000 +0100 committer Full Name <user@organization.tld> 1000050000 +0100
data 29 data 29
F: Merge commit 'D' into 'B' F: Merge commit 'D' into 'B'
from :4 from :2
merge :2 merge :4
blob blob
mark :10 mark :10

@ -2,29 +2,29 @@ feature done
blob blob
mark :1 mark :1
data 10 data 10
keepme v2 keepme v1
reset refs/heads/master reset refs/heads/master
commit refs/heads/master commit refs/heads/master
mark :2 mark :2
author Full Name <user@organization.tld> 1000080000 +0100 author Full Name <user@organization.tld> 1000040000 +0100
committer Full Name <user@organization.tld> 1000080000 +0100 committer Full Name <user@organization.tld> 1000040000 +0100
data 2 data 29
I E: Merge commit 'D' into 'B'
M 100644 :1 keepme M 100644 :1 keepme
blob blob
mark :3 mark :3
data 10 data 10
keepme v1 keepme v2
reset refs/heads/master reset refs/heads/master
commit refs/heads/master commit refs/heads/master
mark :4 mark :4
author Full Name <user@organization.tld> 1000040000 +0100 author Full Name <user@organization.tld> 1000080000 +0100
committer Full Name <user@organization.tld> 1000040000 +0100 committer Full Name <user@organization.tld> 1000080000 +0100
data 29 data 2
E: Merge commit 'D' into 'B' I
M 100644 :3 keepme M 100644 :3 keepme
commit refs/heads/master commit refs/heads/master
@ -33,7 +33,7 @@ author Full Name <user@organization.tld> 1000090000 +0100
committer Full Name <user@organization.tld> 1000090000 +0100 committer Full Name <user@organization.tld> 1000090000 +0100
data 29 data 29
J: Merge commit 'I' into 'H' J: Merge commit 'I' into 'H'
from :4 from :2
merge :2 merge :4
done done

Loading…
Cancel
Save