more tests

test/integration/diffing3/test.json

@@ -1 +1 @@
-{ "description": "diffing two commits and making a patch from their diff files", "speed": 1 }
+{ "description": "diffing two commits and making a patch from their diff files", "speed": 10 }

test/integration/rebaseReword/expected/.git_keep/COMMIT_EDITMSG

@@ -1 +1 @@
-test
+qas

test/integration/rebaseReword/expected/.git_keep/logs/HEAD

@@ -1,4 +1,4 @@
-0000000000000000000000000000000000000000 77a46efac3df6a531125dd83031978f4207fb0bf CI <CI@example.com> 1617674024 +1000	commit (initial): file0
-77a46efac3df6a531125dd83031978f4207fb0bf 1382f9e49487698170ca3356542ed94aff522d18 CI <CI@example.com> 1617674024 +1000	commit: file1
-1382f9e49487698170ca3356542ed94aff522d18 1719c3b9865f00407fbee59ee004104edc8bb62e CI <CI@example.com> 1617674024 +1000	commit: file2
-1719c3b9865f00407fbee59ee004104edc8bb62e 4a225f57a7e50ba304defb8db41d9736dd85613d CI <CI@example.com> 1617674028 +1000	commit (amend): test
+0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI <CI@example.com> 1617683931 +1000	commit (initial): file0
+326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI <CI@example.com> 1617683931 +1000	commit: file1
+b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI <CI@example.com> 1617683931 +1000	commit: file2
+5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI <CI@example.com> 1617683936 +1000	commit (amend): qas

test/integration/rebaseReword/expected/.git_keep/logs/refs/heads/master

@@ -1,4 +1,4 @@
-0000000000000000000000000000000000000000 77a46efac3df6a531125dd83031978f4207fb0bf CI <CI@example.com> 1617674024 +1000	commit (initial): file0
-77a46efac3df6a531125dd83031978f4207fb0bf 1382f9e49487698170ca3356542ed94aff522d18 CI <CI@example.com> 1617674024 +1000	commit: file1
-1382f9e49487698170ca3356542ed94aff522d18 1719c3b9865f00407fbee59ee004104edc8bb62e CI <CI@example.com> 1617674024 +1000	commit: file2
-1719c3b9865f00407fbee59ee004104edc8bb62e 4a225f57a7e50ba304defb8db41d9736dd85613d CI <CI@example.com> 1617674028 +1000	commit (amend): test
+0000000000000000000000000000000000000000 326168774f6c6d9b88ec70f0abe5625f07d3b353 CI <CI@example.com> 1617683931 +1000	commit (initial): file0
+326168774f6c6d9b88ec70f0abe5625f07d3b353 b0ec549c4d16bcfae63f59c6baaa94ce2756d879 CI <CI@example.com> 1617683931 +1000	commit: file1
+b0ec549c4d16bcfae63f59c6baaa94ce2756d879 5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 CI <CI@example.com> 1617683931 +1000	commit: file2
+5e0b8cc09866b4a4ab5e12f34f1f53c1c7bd8cf1 be0070df1dcd3839a2d908622817fee59d918d4d CI <CI@example.com> 1617683936 +1000	commit (amend): qas

test/integration/rebaseReword/expected/.git_keep/objects/17/19c3b9865f00407fbee59ee004104edc8bb62e

@@ -1,2 +0,0 @@
-x
�ŽM
-Â0F]çÙ’™üM@DèªÇH“,4¶”ßÁíÇ{�¯ì­­]CÂK?™ub¢M-T	kÅ,‹To –HDh—‚Eùä÷-¡$vÉQ‰ š’­õÁ;äš\ñˆHåOí§žf}Ÿæ's;6¾•½=4„‘�ΠÓW0ƨ±ŽS�ÿÄ•¬£ú
]æ9

test/integration/rebaseReword/expected/.git_keep/objects/32/6168774f6c6d9b88ec70f0abe5625f07d3b353

@@ -0,0 +1,4 @@
+x
█мA
+ц @я╝=еЛeF╖ │
+YЕG┬┌┘©9B╥÷i╣╝┬ЫжU uЙC▒°Х|л╓┼C*\п╕\╛(Ё5Яш?М─i├в4©У▄uъТ╠╢:y
+~pБН└┬Ф╙в╓К÷э■uS4?э╟+Т

test/integration/rebaseReword/expected/.git_keep/objects/4a/225f57a7e50ba304defb8db41d9736dd85613d

@@ -1,3 +0,0 @@
-x
…ŽK
-1]çÙ’îü: "ÌjŽ‘IwP0Î0FðøfáÞmQõxemíÞ5$8ô]D'!ÊÑp!&dÆ\—ÊÞ@R#	¡]
-µå]ž#´„5‰KŽbHÑ”l­Þ¡pr¹V�È@*¿ûmÝõ4ëó4_å“Ûö�SYÛECóÑtúÆ5è8Õå�N?]uyuõ$ƒ9

test/integration/rebaseReword/expected/.git_keep/objects/77/a46efac3df6a531125dd83031978f4207fb0bf

@@ -1,3 +0,0 @@
-x
�ֽA
-ֲ0Fa׳9ֵל™‰cb@₪׀U�‘4°׀�R"x|{„n¼¹ױ÷tױK�
�ב|
-!ה$ןb€�©ha›r±
T­‰�‏i;�½ֶiְ/ײmֵmnץMגִ;¯l•®ֲּז¨ַ₪ד$7eYֱז�m+ז

test/integration/rebaseReword/expected/.git_keep/refs/heads/master

@@ -1 +1 @@
-4a225f57a7e50ba304defb8db41d9736dd85613d
+be0070df1dcd3839a2d908622817fee59d918d4d

test/integration/rebaseReword/recording.json

@@ -1 +1 @@
-{"KeyEvents":[{"Timestamp":943,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1079,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1471,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1975,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2048,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2231,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2279,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2911,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3087,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3264,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3440,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3615,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3888,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4735,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
+{"KeyEvents":[{"Timestamp":715,"Mod":0,"Key":259,"Ch":0},{"Timestamp":978,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2098,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2730,"Mod":0,"Key":271,"Ch":0},{"Timestamp":2930,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3154,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3410,"Mod":0,"Key":271,"Ch":0},{"Timestamp":3682,"Mod":0,"Key":271,"Ch":0},{"Timestamp":4306,"Mod":0,"Key":256,"Ch":113},{"Timestamp":4658,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4922,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5322,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6066,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/reflogCheckout/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+file2

test/integration/reflogCheckout/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/ma

test/integration/reflogCheckout/expected/.git_keep/config

@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = CI@example.com
+	name = CI

test/integration/reflogCheckout/expected/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/reflogCheckout/expected/.git_keep/info/exclude

@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store

test/integration/reflogCheckout/expected/.git_keep/logs/HEAD

@@ -0,0 +1,10 @@
+0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI <CI@example.com> 1617683558 +1000	commit (initial): file0
+2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI <CI@example.com> 1617683558 +1000	commit: file1
+9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI <CI@example.com> 1617683558 +1000	commit: file2
+40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI <CI@example.com> 1617683558 +1000	commit: file4
+ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI <CI@example.com> 1617683558 +1000	checkout: moving from master to branch2
+ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI <CI@example.com> 1617683558 +1000	commit: file4
+fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI <CI@example.com> 1617683558 +1000	commit: file4
+37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI <CI@example.com> 1617683558 +1000	commit: file2
+10e005e1fa2db07721aa63cb048b87b7a2830b64 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI <CI@example.com> 1617683563 +1000	checkout: moving from branch2 to fdc461cdae46cbcd0e8b
+fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI <CI@example.com> 1617683567 +1000	checkout: moving from fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 to ma

test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/branch2

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI <CI@example.com> 1617683558 +1000	branch: Created from HEAD
+ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI <CI@example.com> 1617683558 +1000	commit: file4
+fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI <CI@example.com> 1617683558 +1000	commit: file4
+37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI <CI@example.com> 1617683558 +1000	commit: file2

test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/ma

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI <CI@example.com> 1617683567 +1000	branch: Created from fdc461c

test/integration/reflogCheckout/expected/.git_keep/logs/refs/heads/master

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI <CI@example.com> 1617683558 +1000	commit (initial): file0
+2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI <CI@example.com> 1617683558 +1000	commit: file1
+9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI <CI@example.com> 1617683558 +1000	commit: file2
+40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI <CI@example.com> 1617683558 +1000	commit: file4

test/integration/reflogCheckout/expected/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226

@@ -0,0 +1,2 @@
+x
�ÎM
+Â0@a×9Eö‚L~&™‚ˆÐU�1If°ÐÚR"x|{·�oñ궮s·nð—~ˆX¤$Žb®œ}«
KæB…¢¢Ï%±z³ó!ïn#HPE¯¥fà¹p¢¬Ú0µÚþô×vØq²÷qzÊ—×}‘[ÝÖ‡uÉåD
‘ìÕ
€9ë9ÕåOnt^$šùó:œ

test/integration/reflogCheckout/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -0,0 +1,2 @@
+x
+)JMU03c040031QHﾋﾌI5`ｰｱｺｲ燹ﾖｶwﾁ�w.ｽ��ﾓ[H
+矢y�5�来ﾐ(桍ｧ
^-ﾝW
(x9

test/integration/reflogCheckout/expected/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32

@@ -0,0 +1,2 @@
+x
ЌОK
+В0FaЗYEж‚Ь<n’‚€РQ—q“ьБBkK‰атнњѕБ)ЫєО]›Б^ъ
и_2•КЎЖДYјчV8[Bpњ‹Ц©]ј».ЁT"`¤№R)&Ў\OM<c€®¶JНЪ дУ_ЫЎЗIЯЗй‰Ї¬ы‚[ЩЦ‡6БДђsТWCDк¬зTЗџ\µyЃW?Ь:¬

test/integration/reflogCheckout/expected/.git_keep/refs/heads/branch2

@@ -0,0 +1 @@
+10e005e1fa2db07721aa63cb048b87b7a2830b64

test/integration/reflogCheckout/expected/.git_keep/refs/heads/ma

@@ -0,0 +1 @@
+fdc461cdae46cbcd0e8b6f33898b25a17ab36f32

test/integration/reflogCheckout/expected/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+ced0c7ee1af3cd078a0bd940fa45e973dfd0f226

test/integration/reflogCheckout/expected/file0

@@ -0,0 +1 @@
+test0

test/integration/reflogCheckout/expected/file1

@@ -0,0 +1 @@
+test1

test/integration/reflogCheckout/expected/file2

@@ -0,0 +1 @@
+test2

test/integration/reflogCheckout/expected/file4

@@ -0,0 +1,2 @@
+line one
+line two

test/integration/reflogCheckout/recording.json

@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":793,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1160,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2481,"Mod":0,"Key":256,"Ch":93},{"Timestamp":4009,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4152,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4536,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5153,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6537,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7248,"Mod":0,"Key":256,"Ch":110},{"Timestamp":7767,"Mod":0,"Key":256,"Ch":109},{"Timestamp":8335,"Mod":0,"Key":256,"Ch":97},{"Timestamp":9168,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10224,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/reflogCheckout/setup.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+cd $1
+
+git init
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+echo test0 > file0
+git add .
+git commit -am file0
+
+echo test1 > file1
+git add .
+git commit -am file1
+
+echo test2 > file2
+git add .
+git commit -am file2
+
+echo "line one" > file4
+git add .
+git commit -am file4
+
+git checkout -b branch2
+
+echo "line two" >> file4
+git add .
+git commit -am file4
+
+echo "line three" >> file4
+git add .
+git commit -am file4
+
+echo "line two" >> file2
+git add .
+git commit -am file2

test/integration/reflogCheckout/test.json

@@ -0,0 +1 @@
+{ "description": "checking out a commit in the reflog context", "speed": 10 }

test/integration/reflogCherryPick/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+file2

test/integration/reflogCherryPick/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

test/integration/reflogCherryPick/expected/.git_keep/ORIG_HEAD

@@ -0,0 +1 @@
+afeb127e4579981e4b852e8aabb44b07f2ea4e09

test/integration/reflogCherryPick/expected/.git_keep/config

@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = CI@example.com
+	name = CI

test/integration/reflogCherryPick/expected/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/reflogCherryPick/expected/.git_keep/info/exclude

@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store

test/integration/reflogCherryPick/expected/.git_keep/logs/HEAD

@@ -0,0 +1,12 @@
+0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI <CI@example.com> 1617683609 +1000	commit (initial): file0
+5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI <CI@example.com> 1617683609 +1000	commit: file1
+713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI <CI@example.com> 1617683609 +1000	commit: file2
+e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI <CI@example.com> 1617683609 +1000	commit: file4
+afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI <CI@example.com> 1617683609 +1000	checkout: moving from master to branch2
+afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI <CI@example.com> 1617683609 +1000	commit: file4
+ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI <CI@example.com> 1617683609 +1000	commit: file4
+a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI <CI@example.com> 1617683609 +1000	commit: file2
+bc8891320172f4cfa3efd7bb8767a46daa200d79 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI <CI@example.com> 1617683610 +1000	checkout: moving from branch2 to master
+afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI <CI@example.com> 1617683619 +1000	rebase -i (start): checkout HEAD
+afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI <CI@example.com> 1617683619 +1000	rebase -i (pick): file2
+35bedc872b1ca9e026e51c4017416acba4b3d64b 35bedc872b1ca9e026e51c4017416acba4b3d64b CI <CI@example.com> 1617683619 +1000	rebase -i (finish): returning to refs/heads/master

test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/branch2

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI <CI@example.com> 1617683609 +1000	branch: Created from HEAD
+afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI <CI@example.com> 1617683609 +1000	commit: file4
+ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI <CI@example.com> 1617683609 +1000	commit: file4
+a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI <CI@example.com> 1617683609 +1000	commit: file2

test/integration/reflogCherryPick/expected/.git_keep/logs/refs/heads/master

@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI <CI@example.com> 1617683609 +1000	commit (initial): file0
+5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI <CI@example.com> 1617683609 +1000	commit: file1
+713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI <CI@example.com> 1617683609 +1000	commit: file2
+e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI <CI@example.com> 1617683609 +1000	commit: file4
+afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI <CI@example.com> 1617683619 +1000	rebase -i (finish): refs/heads/master onto afeb127e4579981e4b852e8aabb44b07f2ea4e09

test/integration/reflogCherryPick/expected/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b

@@ -0,0 +1,2 @@
+x
}ÎM
+Â0@a×9Eö‚d&“Ÿ
¡«c’N°`m)<¾Ý¸uûø¯®Ë2wŒ§¾«Zò€ÍKà‰j@™2c ¢ä§$‰sÒ‹Nf“]_ÝJÓ˜”BbΠTr@Í"¥—ª�:6òî�u·Ãh¯Ãx×�,ÛS/u]n"¤˜}tlÏàœ3G=¦ºþçðã¦ÍOEórK9ª

test/integration/reflogCherryPick/expected/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223

@@ -0,0 +1,2 @@
+x
�ΝA
+Β0@QΧ9Εμ™IΗID„®z�¤™`΅!¥Dπψφn?ώ�j];σ¥f@6�„¤�9Ρ=HΜd†c*\Π§\Ό+³wρΣίν€i†Η4ΏμλΎΩmiυ	$d®„�ξ¬η¤Ϋ�ά•u3t?έ8+ψ

test/integration/reflogCherryPick/expected/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6

@@ -0,0 +1,2 @@
+x
��M
+Β0F]ηΩ’ΙΟ¤"BW=Ζ$™`΅±¥Dπψζςvοƒ—χΦΦ®�μ¥�"Ί��9SΞ†83Ϋβ°¦™B-N¬3θΙ£uπ)ﮀb°uS*S(γ$!ΑTΌ/h­Sόι―ύΤσΆοσς”/·c“[ήΫCBΔΙ΅!}c�λ�κς§®κΊ	¨ΗI9χ

test/integration/reflogCherryPick/expected/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1

@@ -0,0 +1,2 @@
+x
�ÎK
+Â0FaÇYEæ‚äqó¡£.ãÞô/[J—o—àôð
NÝZ[º¶Å]ú
èªbêâ”r&"ÇAœAb„	�á}r^í|àÝ5Ïë(¤R²I™Y„HLš˜`ŠâOm‡F}Æ'¾Üö·ºµ‡¶Ñ¦˜}4E_­1F�õœêø“«yYAêÌþ:!

test/integration/reflogCherryPick/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -0,0 +1,2 @@
+x
+)JMU03c040031QHﾋﾌI5`ｰｱｺｲ燹ﾖｶwﾁ�w.ｽ��ﾓ[H
+矢y�5�来ﾐ(桍ｧ
^-ﾝW
(x9

test/integration/reflogCherryPick/expected/.git_keep/refs/heads/branch2

@@ -0,0 +1 @@
+bc8891320172f4cfa3efd7bb8767a46daa200d79

test/integration/reflogCherryPick/expected/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+35bedc872b1ca9e026e51c4017416acba4b3d64b

test/integration/reflogCherryPick/expected/file0

@@ -0,0 +1 @@
+test0

test/integration/reflogCherryPick/expected/file1

@@ -0,0 +1 @@
+test1

test/integration/reflogCherryPick/expected/file2

@@ -0,0 +1,2 @@
+test2
+line two

test/integration/reflogCherryPick/expected/file4

@@ -0,0 +1 @@
+line one

test/integration/reflogCherryPick/recording.json

@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":574,"Mod":0,"Key":259,"Ch":0},{"Timestamp":829,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1029,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2773,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4325,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4933,"Mod":0,"Key":256,"Ch":93},{"Timestamp":6029,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7524,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8861,"Mod":0,"Key":256,"Ch":91},{"Timestamp":9613,"Mod":0,"Key":256,"Ch":118},{"Timestamp":9974,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10837,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/reflogCherryPick/setup.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+cd $1
+
+git init
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+echo test0 > file0
+git add .
+git commit -am file0
+
+echo test1 > file1
+git add .
+git commit -am file1
+
+echo test2 > file2
+git add .
+git commit -am file2
+
+echo "line one" > file4
+git add .
+git commit -am file4
+
+git checkout -b branch2
+
+echo "line two" >> file4
+git add .
+git commit -am file4
+
+echo "line three" >> file4
+git add .
+git commit -am file4
+
+echo "line two" >> file2
+git add .
+git commit -am file2

test/integration/reflogCherryPick/test.json

@@ -0,0 +1 @@
+{ "description": "cherry-picking a commit from the reflog context", "speed": 10 }