mirror of
https://github.com/newren/git-filter-repo.git
synced 2024-07-06 10:22:16 +02:00
838bdd19f6
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>
40 lines
727 B
Plaintext
40 lines
727 B
Plaintext
feature done
|
|
blob
|
|
mark :1
|
|
data 10
|
|
keepme v1
|
|
|
|
reset refs/heads/master
|
|
commit refs/heads/master
|
|
mark :2
|
|
author Full Name <user@organization.tld> 1000040000 +0100
|
|
committer Full Name <user@organization.tld> 1000040000 +0100
|
|
data 29
|
|
E: Merge commit 'D' into 'B'
|
|
M 100644 :1 keepme
|
|
|
|
blob
|
|
mark :3
|
|
data 10
|
|
keepme v2
|
|
|
|
reset refs/heads/master
|
|
commit refs/heads/master
|
|
mark :4
|
|
author Full Name <user@organization.tld> 1000080000 +0100
|
|
committer Full Name <user@organization.tld> 1000080000 +0100
|
|
data 2
|
|
I
|
|
M 100644 :3 keepme
|
|
|
|
commit refs/heads/master
|
|
mark :5
|
|
author Full Name <user@organization.tld> 1000090000 +0100
|
|
committer Full Name <user@organization.tld> 1000090000 +0100
|
|
data 29
|
|
J: Merge commit 'I' into 'H'
|
|
from :2
|
|
merge :4
|
|
|
|
done
|