From 838bdd19f6cb60b705e05a65e7c7f0cb87cf3d92 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefano@rivera.za.net>
Date: Sun, 6 Mar 2022 12:28:20 -0400
Subject: [PATCH] Update expected test data for git 2.35

Commit order from fast-export --first-parent has changed in git 2.35,
see https://github.com/git/git/commit/726a228dfb19fae8befa0f209436f8fae7919a58

This will break the same tests on older git releases.

Fixes: #344
Signed-off-by: Stefano Rivera <stefano@rivera.za.net>
---
 t/t9390/less-empty-keepme | 32 ++++++++++++++++----------------
 t/t9390/more-empty-keepme | 24 ++++++++++++------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/t/t9390/less-empty-keepme b/t/t9390/less-empty-keepme
index b8acab94..1a7ba5cb 100644
--- a/t/t9390/less-empty-keepme
+++ b/t/t9390/less-empty-keepme
@@ -2,33 +2,33 @@ feature done
 reset refs/heads/master
 commit refs/heads/master
 mark :1
-author Full Name <user@organization.tld> 1000020000 +0100
-committer Full Name <user@organization.tld> 1000020000 +0100
+author Full Name <user@organization.tld> 1000000000 +0100
+committer Full Name <user@organization.tld> 1000000000 +0100
 data 2
-C
+A
 
 commit refs/heads/master
 mark :2
-author Full Name <user@organization.tld> 1000030000 +0100
-committer Full Name <user@organization.tld> 1000030000 +0100
+author Full Name <user@organization.tld> 1000010000 +0100
+committer Full Name <user@organization.tld> 1000010000 +0100
 data 2
-D
+B
 from :1
 
 reset refs/heads/master
 commit refs/heads/master
 mark :3
-author Full Name <user@organization.tld> 1000000000 +0100
-committer Full Name <user@organization.tld> 1000000000 +0100
+author Full Name <user@organization.tld> 1000020000 +0100
+committer Full Name <user@organization.tld> 1000020000 +0100
 data 2
-A
+C
 
 commit refs/heads/master
 mark :4
-author Full Name <user@organization.tld> 1000010000 +0100
-committer Full Name <user@organization.tld> 1000010000 +0100
+author Full Name <user@organization.tld> 1000030000 +0100
+committer Full Name <user@organization.tld> 1000030000 +0100
 data 2
-B
+D
 from :3
 
 blob
@@ -42,8 +42,8 @@ author Full Name <user@organization.tld> 1000040000 +0100
 committer Full Name <user@organization.tld> 1000040000 +0100
 data 29
 E: Merge commit 'D' into 'B'
-from :4
-merge :2
+from :2
+merge :4
 M 100644 :5 keepme
 
 commit refs/heads/master
@@ -68,8 +68,8 @@ author Full Name <user@organization.tld> 1000050000 +0100
 committer Full Name <user@organization.tld> 1000050000 +0100
 data 29
 F: Merge commit 'D' into 'B'
-from :4
-merge :2
+from :2
+merge :4
 
 blob
 mark :10
diff --git a/t/t9390/more-empty-keepme b/t/t9390/more-empty-keepme
index 902821da..f181c5a2 100644
--- a/t/t9390/more-empty-keepme
+++ b/t/t9390/more-empty-keepme
@@ -2,29 +2,29 @@ feature done
 blob
 mark :1
 data 10
-keepme v2
+keepme v1
 
 reset refs/heads/master
 commit refs/heads/master
 mark :2
-author Full Name <user@organization.tld> 1000080000 +0100
-committer Full Name <user@organization.tld> 1000080000 +0100
-data 2
-I
+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 v1
+keepme v2
 
 reset refs/heads/master
 commit refs/heads/master
 mark :4
-author Full Name <user@organization.tld> 1000040000 +0100
-committer Full Name <user@organization.tld> 1000040000 +0100
-data 29
-E: Merge commit 'D' into 'B'
+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
@@ -33,7 +33,7 @@ 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 :4
-merge :2
+from :2
+merge :4
 
 done