update snapshots to include tags comparison

pkg/integration/integration.go

@@ -60,7 +60,7 @@ func RunTests(
 			testPath := filepath.Join(testDir, test.Name)
 			actualDir := filepath.Join(testPath, "actual")
 			expectedDir := filepath.Join(testPath, "expected")
-			logf("testPath: %s, actualDir: %s, expectedDir: %s", testPath, actualDir, expectedDir)
+			logf("path: %s", testPath)
 
 			// three retries at normal speed for the sake of flakey tests
 			speeds = append(speeds, 1, 1, 1)
@@ -91,6 +91,13 @@ func RunTests(
 					if err != nil {
 						return err
 					}
+					err = os.Rename(
+						filepath.Join(expectedDir, ".git"),
+						filepath.Join(expectedDir, ".git_keep"),
+					)
+					if err != nil {
+						return err
+					}
 				}
 
 				actual, expected, err := generateSnapshots(actualDir, expectedDir)
@@ -262,22 +269,19 @@ func generateSnapshot(dir string) (string, error) {
 
 	snapshot := ""
 
-	statusCmd := fmt.Sprintf(`git -C %s status`, dir)
+	cmdStrs := []string{
-	statusCmdOutput, err := osCommand.RunCommandWithOutput(statusCmd)
+		fmt.Sprintf(`git -C %s status`, dir),                 // file tree
-	if err != nil {
+		fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir), // log
-		return "", err
+		fmt.Sprintf(`git -C %s tag -n`, dir),                 // tags
 	}
 
-	snapshot += statusCmdOutput + "\n"
+	for _, cmdStr := range cmdStrs {
+		// ignoring error for now. If there's an error it could be that there are no results
+		output, _ := osCommand.RunCommandWithOutput(cmdStr)
 
-	logCmd := fmt.Sprintf(`git -C %s log --pretty=%%B -p -1`, dir)
+		snapshot += output + "\n"
-	logCmdOutput, err := osCommand.RunCommandWithOutput(logCmd)
-	if err != nil {
-		return "", err
 	}
 
-	snapshot += logCmdOutput + "\n"
-
 	err = filepath.Walk(dir, func(path string, f os.FileInfo, err error) error {
 		if err != nil {
 			return err

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

@@ -1,6 +1,6 @@
-0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	commit (initial): initial commit
+0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	commit (initial): initial commit
-7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	checkout: moving from master to one
+f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	checkout: moving from master to one
-7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	checkout: moving from one to two
+f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	checkout: moving from one to two
-7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	checkout: moving from two to three
+f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	checkout: moving from two to three
-7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	checkout: moving from three to four
+f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	checkout: moving from three to four
-7877532bb822c0e04f5ecbc78fc414f997ba53cf 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582245 +1000	checkout: moving from four to three
+f753f4dfc98d148a7e685c46c8d148bcac56707d f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671338 +1000	checkout: moving from four to three

test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/four

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	branch: Created from HEAD
+0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	branch: Created from HEAD

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

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	commit (initial): initial commit
+0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	commit (initial): initial commit

test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/one

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	branch: Created from HEAD
+0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	branch: Created from HEAD

test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/three

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	branch: Created from HEAD
+0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	branch: Created from HEAD

test/integration/branchAutocomplete/expected/.git_keep/logs/refs/heads/two

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7877532bb822c0e04f5ecbc78fc414f997ba53cf CI <CI@example.com> 1617582242 +1000	branch: Created from HEAD
+0000000000000000000000000000000000000000 f753f4dfc98d148a7e685c46c8d148bcac56707d CI <CI@example.com> 1617671335 +1000	branch: Created from HEAD

test/integration/branchAutocomplete/expected/.git_keep/refs/heads/four

@@ -1 +1 @@
-7877532bb822c0e04f5ecbc78fc414f997ba53cf
+f753f4dfc98d148a7e685c46c8d148bcac56707d

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

@@ -1 +1 @@
-7877532bb822c0e04f5ecbc78fc414f997ba53cf
+f753f4dfc98d148a7e685c46c8d148bcac56707d

test/integration/branchAutocomplete/expected/.git_keep/refs/heads/one

@@ -1 +1 @@
-7877532bb822c0e04f5ecbc78fc414f997ba53cf
+f753f4dfc98d148a7e685c46c8d148bcac56707d

test/integration/branchAutocomplete/expected/.git_keep/refs/heads/three

@@ -1 +1 @@
-7877532bb822c0e04f5ecbc78fc414f997ba53cf
+f753f4dfc98d148a7e685c46c8d148bcac56707d

test/integration/branchAutocomplete/expected/.git_keep/refs/heads/two

@@ -1 +1 @@
-7877532bb822c0e04f5ecbc78fc414f997ba53cf
+f753f4dfc98d148a7e685c46c8d148bcac56707d

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

@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 47912ceb0ffa9b205290e75103d9dd6b1878e87b CI <CI@example.com> 1617580570 +1000	commit (initial): myfile1
+0000000000000000000000000000000000000000 3df3d8761bc0f0828596b11845aeac175b7b7393 CI <CI@example.com> 1617671339 +1000	commit (initial): myfile1
-47912ceb0ffa9b205290e75103d9dd6b1878e87b 6bd1486e023f9853f9e6f611cac5ccbc8960ce57 CI <CI@example.com> 1617580570 +1000	commit: myfile2
+3df3d8761bc0f0828596b11845aeac175b7b7393 a7d53cc21fd53100f955377be379423b0e386274 CI <CI@example.com> 1617671339 +1000	commit: myfile2
-6bd1486e023f9853f9e6f611cac5ccbc8960ce57 980224a1dd75d91fdcab11edc8d25c3ff8f751ba CI <CI@example.com> 1617580570 +1000	commit: myfile3
+a7d53cc21fd53100f955377be379423b0e386274 4ba4f1ed711a9081fab21bc222469aa5176a01f8 CI <CI@example.com> 1617671339 +1000	commit: myfile3
-980224a1dd75d91fdcab11edc8d25c3ff8f751ba f4e779d1bd2ad074259ad763210f5b911337054f CI <CI@example.com> 1617580570 +1000	commit: myfile4
+4ba4f1ed711a9081fab21bc222469aa5176a01f8 1440bc6cc888a09dca2329d1060eec6de78d9d21 CI <CI@example.com> 1617671339 +1000	commit: myfile4
-f4e779d1bd2ad074259ad763210f5b911337054f d0cab53ed70fc66096575c2ccd7ef150b4b470e8 CI <CI@example.com> 1617580572 +1000	commit: commit
+1440bc6cc888a09dca2329d1060eec6de78d9d21 e7560e2cd4783a261ad32496cefed2d9f69a46e7 CI <CI@example.com> 1617671342 +1000	commit: commit

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

@@ -1,5 +1,5 @@
-0000000000000000000000000000000000000000 47912ceb0ffa9b205290e75103d9dd6b1878e87b CI <CI@example.com> 1617580570 +1000	commit (initial): myfile1
+0000000000000000000000000000000000000000 3df3d8761bc0f0828596b11845aeac175b7b7393 CI <CI@example.com> 1617671339 +1000	commit (initial): myfile1
-47912ceb0ffa9b205290e75103d9dd6b1878e87b 6bd1486e023f9853f9e6f611cac5ccbc8960ce57 CI <CI@example.com> 1617580570 +1000	commit: myfile2
+3df3d8761bc0f0828596b11845aeac175b7b7393 a7d53cc21fd53100f955377be379423b0e386274 CI <CI@example.com> 1617671339 +1000	commit: myfile2
-6bd1486e023f9853f9e6f611cac5ccbc8960ce57 980224a1dd75d91fdcab11edc8d25c3ff8f751ba CI <CI@example.com> 1617580570 +1000	commit: myfile3
+a7d53cc21fd53100f955377be379423b0e386274 4ba4f1ed711a9081fab21bc222469aa5176a01f8 CI <CI@example.com> 1617671339 +1000	commit: myfile3
-980224a1dd75d91fdcab11edc8d25c3ff8f751ba f4e779d1bd2ad074259ad763210f5b911337054f CI <CI@example.com> 1617580570 +1000	commit: myfile4
+4ba4f1ed711a9081fab21bc222469aa5176a01f8 1440bc6cc888a09dca2329d1060eec6de78d9d21 CI <CI@example.com> 1617671339 +1000	commit: myfile4
-f4e779d1bd2ad074259ad763210f5b911337054f d0cab53ed70fc66096575c2ccd7ef150b4b470e8 CI <CI@example.com> 1617580572 +1000	commit: commit
+1440bc6cc888a09dca2329d1060eec6de78d9d21 e7560e2cd4783a261ad32496cefed2d9f69a46e7 CI <CI@example.com> 1617671342 +1000	commit: commit

test/integration/commit/expected/.git_keep/objects/3d/f3d8761bc0f0828596b11845aeac175b7b7393

@@ -0,0 +1,3 @@
+x
��A
+�0@Q�9���i�I
+"BW=F�L��!R"����~�����r��*�J��d	��¬�D���"\S�.����0�p���~��6��fw � ���L���zL��ɝ}��)�2r,�

test/integration/commit/expected/.git_keep/objects/f4/e779d1bd2ad074259ad763210f5b911337054f

@@ -1,2 +0,0 @@
-x
��K
-�0@]��2�d��"BW=�4�`���D���#�}<x/o�-]cr�~�hS=6������{�l�K��Y�L	�·��N�q��*	k�<#Jɱʶ�X�̊���z��0N�p�W����5�I�@
�
@�������ڷ.�8�#�9}

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

@@ -1 +1 @@
-d0cab53ed70fc66096575c2ccd7ef150b4b470e8
+e7560e2cd4783a261ad32496cefed2d9f69a46e7

test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD

@@ -1 +1 @@
-3633f8c997d88e0c59202f498c8344da9da3aaf4
+11bdfc142c42c6ffaa904890ab61ec76262ec9ca

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

@@ -1,8 +1,8 @@
-0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000	commit (initial): one
+0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI <CI@example.com> 1617671344 +1000	commit (initial): one
-459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000	commit: both-deleted.txt renamed in added-them-changed-us.txt
+98e834e9cdae1191de7fafb2b6f334bddd0793e8 9976d7948def8b082e9d20135d6a04624d711752 CI <CI@example.com> 1617671344 +1000	commit: both-deleted.txt renamed in added-them-changed-us.txt
-0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000	commit: two
+9976d7948def8b082e9d20135d6a04624d711752 8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e CI <CI@example.com> 1617671344 +1000	commit: two
-837fbbc4ee6892b828a4a94be22c39814146aafb 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000	checkout: moving from conflict to conflict_second
+8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI <CI@example.com> 1617671344 +1000	checkout: moving from conflict to conflict_second
-459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000	commit: both-deleted.txt renamed in changed-them-added-us.txt
+98e834e9cdae1191de7fafb2b6f334bddd0793e8 c91b3b139ea108475c19839fcda3a4e33db4ccc9 CI <CI@example.com> 1617671344 +1000	commit: both-deleted.txt renamed in changed-them-added-us.txt
-3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000	commit: three
+c91b3b139ea108475c19839fcda3a4e33db4ccc9 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI <CI@example.com> 1617671344 +1000	commit: three
-3633f8c997d88e0c59202f498c8344da9da3aaf4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000	reset: moving to conflict_second
+11bdfc142c42c6ffaa904890ab61ec76262ec9ca 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI <CI@example.com> 1617671344 +1000	reset: moving to conflict_second
-3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000	commit (merge): Merge branch 'conflict' into conflict_second
+11bdfc142c42c6ffaa904890ab61ec76262ec9ca 854f08fa802293e0679d07771547fe9fe5d159e8 CI <CI@example.com> 1617671365 +1000	commit (merge): Merge branch 'conflict' into conflict_second

test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000	commit (initial): one
+0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI <CI@example.com> 1617671344 +1000	commit (initial): one
-459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000	commit: both-deleted.txt renamed in added-them-changed-us.txt
+98e834e9cdae1191de7fafb2b6f334bddd0793e8 9976d7948def8b082e9d20135d6a04624d711752 CI <CI@example.com> 1617671344 +1000	commit: both-deleted.txt renamed in added-them-changed-us.txt
-0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000	commit: two
+9976d7948def8b082e9d20135d6a04624d711752 8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e CI <CI@example.com> 1617671344 +1000	commit: two

test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second

@@ -1,4 +1,4 @@
-0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000	branch: Created from conflict
+0000000000000000000000000000000000000000 98e834e9cdae1191de7fafb2b6f334bddd0793e8 CI <CI@example.com> 1617671344 +1000	branch: Created from conflict
-459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000	commit: both-deleted.txt renamed in changed-them-added-us.txt
+98e834e9cdae1191de7fafb2b6f334bddd0793e8 c91b3b139ea108475c19839fcda3a4e33db4ccc9 CI <CI@example.com> 1617671344 +1000	commit: both-deleted.txt renamed in changed-them-added-us.txt
-3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000	commit: three
+c91b3b139ea108475c19839fcda3a4e33db4ccc9 11bdfc142c42c6ffaa904890ab61ec76262ec9ca CI <CI@example.com> 1617671344 +1000	commit: three
-3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000	commit (merge): Merge branch 'conflict' into conflict_second
+11bdfc142c42c6ffaa904890ab61ec76262ec9ca 854f08fa802293e0679d07771547fe9fe5d159e8 CI <CI@example.com> 1617671365 +1000	commit (merge): Merge branch 'conflict' into conflict_second

test/integration/discardFileChanges/expected/.git_keep/objects/11/bdfc142c42c6ffaa904890ab61ec76262ec9ca

@@ -0,0 +1,2 @@
+x
��A
+�0@Q�9E��d:i�
��cf2A��R"x|{���x����h8��̏�5I�\�Yr̀�D�ؐj)4�$���w{w��H�rL�e�����!��J�?���~^�u^��嶽��k�y� M	0F��;�������㠻!z:�

test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4

@@ -1,2 +0,0 @@
-x
��͊�0�q�y��*I�Հ�|�$��
-��z��=�9����Mht� ;@H�3�F�c��iv�Ą�"�TƤG�z����i�^�g�2�l�Vf�6��9:�Ψ��e��|�����wn�;�uk�d��~ꯑ~��Z���_��l��;|��P����Ju��<Ȃ6�.����D���K`

test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4

@@ -1,2 +0,0 @@
-x
��M
-�0@a�9E�����1f�3([J�o������?��-��.bsc������#19�J@��_(��p���1$@e(���[U�
������Pp���g<��N��N�]�ط�\x�7닇\C�g��3G=PC���xt���:L

test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041

@@ -1,3 +0,0 @@
-x
���
-�0�a�}��I��T�1�i���kǨ���G�����[����ww5�2�Z���J��bt-n����`��h;���e��������$��ă
-�	�Q�I�?yho?P*�

test/integration/discardFileChanges/expected/.git_keep/objects/99/76d7948def8b082e9d20135d6a04624d711752

@@ -0,0 +1 @@
+x
��Aj�0E��)f_4�*YJ!�c�����	��uo��{�ū[�7�)�7�
�������s��GK1��2����Q�1��\U��Y���2�ؼEU]�� O[��.W:_�_xI�q�[�$��bb��sn8�1e�g>�͖Qq�AO�2:֤C鶒�BG[�Ǻ��}���/~
�L�

test/integration/discardFileChanges/expected/.git_keep/objects/c9/1b3b139ea108475c19839fcda3a4e33db4ccc9

@@ -0,0 +1,2 @@
+x
��K��0��)z?8�gɂ0d�cH��8���@�?�
+�{<

test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict

@@ -1 +1 @@
-837fbbc4ee6892b828a4a94be22c39814146aafb
+8c82faa1358ce6cddba19d59b2924cbcc5ef1c8e

test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second

@@ -1 +1 @@
-39d62c8a07e5103fef16c32373738ce92c4549b7
+854f08fa802293e0679d07771547fe9fe5d159e8

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

@@ -1,7 +1,7 @@
-0000000000000000000000000000000000000000 4c2d0500178f2642effb990e6d65e073022bf50b CI <CI@example.com> 1617665274 +1000	commit (initial): file0
+0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI <CI@example.com> 1617671367 +1000	commit (initial): file0
-4c2d0500178f2642effb990e6d65e073022bf50b 0315577613e2e65683d0dcf3371940a44ea073ca CI <CI@example.com> 1617665274 +1000	commit: file1
+f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI <CI@example.com> 1617671367 +1000	commit: file1
-0315577613e2e65683d0dcf3371940a44ea073ca 5fbbe6422fb135ada1a05b15f61369747d4e6842 CI <CI@example.com> 1617665274 +1000	commit: file2
+4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI <CI@example.com> 1617671367 +1000	commit: file2
-5fbbe6422fb135ada1a05b15f61369747d4e6842 f712b0a288ced6c49e6cfcf16f7af0991e50849d CI <CI@example.com> 1617665274 +1000	commit: file1 and file2
+d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI <CI@example.com> 1617671367 +1000	commit: file1 and file2
-f712b0a288ced6c49e6cfcf16f7af0991e50849d 5192ae05adf946800910d092fb406eb04d56a578 CI <CI@example.com> 1617665274 +1000	commit: file
+f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI <CI@example.com> 1617671367 +1000	commit: file
-5192ae05adf946800910d092fb406eb04d56a578 667b767bf067438c08d47c54fe756a34f238b90d CI <CI@example.com> 1617665282 +1000	commit: asd
+8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI <CI@example.com> 1617671375 +1000	commit: asd
-667b767bf067438c08d47c54fe756a34f238b90d d69102e71a2f400fe52feab06516e05cdaf7d0ba CI <CI@example.com> 1617665289 +1000	commit: test
+af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI <CI@example.com> 1617671383 +1000	commit: test

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

@@ -1,7 +1,7 @@
-0000000000000000000000000000000000000000 4c2d0500178f2642effb990e6d65e073022bf50b CI <CI@example.com> 1617665274 +1000	commit (initial): file0
+0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI <CI@example.com> 1617671367 +1000	commit (initial): file0
-4c2d0500178f2642effb990e6d65e073022bf50b 0315577613e2e65683d0dcf3371940a44ea073ca CI <CI@example.com> 1617665274 +1000	commit: file1
+f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI <CI@example.com> 1617671367 +1000	commit: file1
-0315577613e2e65683d0dcf3371940a44ea073ca 5fbbe6422fb135ada1a05b15f61369747d4e6842 CI <CI@example.com> 1617665274 +1000	commit: file2
+4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI <CI@example.com> 1617671367 +1000	commit: file2
-5fbbe6422fb135ada1a05b15f61369747d4e6842 f712b0a288ced6c49e6cfcf16f7af0991e50849d CI <CI@example.com> 1617665274 +1000	commit: file1 and file2
+d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI <CI@example.com> 1617671367 +1000	commit: file1 and file2
-f712b0a288ced6c49e6cfcf16f7af0991e50849d 5192ae05adf946800910d092fb406eb04d56a578 CI <CI@example.com> 1617665274 +1000	commit: file
+f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI <CI@example.com> 1617671367 +1000	commit: file
-5192ae05adf946800910d092fb406eb04d56a578 667b767bf067438c08d47c54fe756a34f238b90d CI <CI@example.com> 1617665282 +1000	commit: asd
+8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI <CI@example.com> 1617671375 +1000	commit: asd
-667b767bf067438c08d47c54fe756a34f238b90d d69102e71a2f400fe52feab06516e05cdaf7d0ba CI <CI@example.com> 1617665289 +1000	commit: test
+af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI <CI@example.com> 1617671383 +1000	commit: test

test/integration/filterPath/expected/.git_keep/objects/5f/bbe6422fb135ada1a05b15f61369747d4e6842

@@ -1,5 +0,0 @@
-x
��K
-�0��)�/K�H�R
-Y��-�@҄�B�_�������mK�0ढ़�vPf!W2�RP�\Kt@I+�3�9c6���n�y��(�W�����=������g1�i����d���ԯlǪ��o��SD
-�
-�9��~�韸�˪h~a�96

test/integration/filterPath/expected/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b

@@ -0,0 +1,2 @@
+x
��A
+� E�����DG(��U�1�#

test/integration/filterPath/expected/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39

@@ -0,0 +1,2 @@
+x
��K
+�0@]��$��$ "t�cL�	����zw��[���6w0�\�!D�H��Qs��*'L���Kv�eA�&�Q;�v(dl(�F��j[}5���rL>��I񻿶������}�[��0 B���V�=�����:/��k��_b;�

test/integration/filterPath/expected/.git_keep/objects/f7/12b0a288ced6c49e6cfcf16f7af0991e50849d

@@ -1,3 +0,0 @@
-x
��K
-�0@]��$3�D��z�I2�BӖ��[o���x���������>	�cԜ���#�jB�%�j� Z
-Bj�C���$�Մ�����&�����7�q���wm����)n�"����C��%o��Zku�s�˟���"���/�+<|

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

@@ -1 +1 @@
-d69102e71a2f400fe52feab06516e05cdaf7d0ba
+22adc4567aba3d1a0acf28b4cef312922d516aeb

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

@@ -1,6 +1,6 @@
-0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI <CI@example.com> 1617668883 +1000	commit (initial): file0
+0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI <CI@example.com> 1617671384 +1000	commit (initial): file0
-36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI <CI@example.com> 1617668883 +1000	commit: file1
+703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI <CI@example.com> 1617671384 +1000	commit: file1
-7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI <CI@example.com> 1617668883 +1000	commit: file2
+a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI <CI@example.com> 1617671384 +1000	commit: file2
-f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI <CI@example.com> 1617668883 +1000	commit: file1 and file2
+6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI <CI@example.com> 1617671384 +1000	commit: file1 and file2
-914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI <CI@example.com> 1617668883 +1000	commit: file
+c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI <CI@example.com> 1617671384 +1000	commit: file
-23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI <CI@example.com> 1617668905 +1000	commit: test
+e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI <CI@example.com> 1617671407 +1000	commit: test

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

@@ -1,6 +1,6 @@
-0000000000000000000000000000000000000000 36d991b179958e18281131be9914649ebe40bfba CI <CI@example.com> 1617668883 +1000	commit (initial): file0
+0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI <CI@example.com> 1617671384 +1000	commit (initial): file0
-36d991b179958e18281131be9914649ebe40bfba 7d3e3bcc43446179c3fe38dec8cfccb87514c3fa CI <CI@example.com> 1617668883 +1000	commit: file1
+703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI <CI@example.com> 1617671384 +1000	commit: file1
-7d3e3bcc43446179c3fe38dec8cfccb87514c3fa f6707836a7d9a861ebfeff921a45ed43cd429cef CI <CI@example.com> 1617668883 +1000	commit: file2
+a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI <CI@example.com> 1617671384 +1000	commit: file2
-f6707836a7d9a861ebfeff921a45ed43cd429cef 914d8fff27717808920192dc44535c711f41dc75 CI <CI@example.com> 1617668883 +1000	commit: file1 and file2
+6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI <CI@example.com> 1617671384 +1000	commit: file1 and file2
-914d8fff27717808920192dc44535c711f41dc75 23b4388df8cdc033c4266f55a4234c41f2e6a857 CI <CI@example.com> 1617668883 +1000	commit: file
+c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI <CI@example.com> 1617671384 +1000	commit: file
-23b4388df8cdc033c4266f55a4234c41f2e6a857 c1a2676f74b3007ebb101d4d121cecb4850f1378 CI <CI@example.com> 1617668905 +1000	commit: test
+e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI <CI@example.com> 1617671407 +1000	commit: test

test/integration/filterPath2/expected/.git_keep/objects/7d/3e3bcc43446179c3fe38dec8cfccb87514c3fa

@@ -1,2 +0,0 @@
-x
��A
-� @Ѯ=��BqԌ�R�*��q��؄`�ǯG������֮�쥟"�����l(qJ�8��C��'���у:�)��"���(mp�e��H�x�kN*}�k?�����<��ڱɍ��Ѐc�N_��FS]�䪮���
d�9O

test/integration/filterPath2/expected/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8

@@ -0,0 +1,2 @@
+x
��K
+�0��)�/�vlJ)d�c(�L�\���ޠ��0O�e�8�.�P��rQ��ѲPʕ3��tEB

test/integration/filterPath2/expected/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914

@@ -0,0 +1,3 @@
+x
��A
+� @Ѯ=��Bqt�J)d�c�:�@lB���7G����l�/CC��8D4a&�j��$�J3$�
+y��u��\ѫ�y}���k��M�!!�E��q��L�?��z��}���徯r+[hCG��`�Qg=����U[VQ?�9

test/integration/filterPath2/expected/.git_keep/objects/f6/707836a7d9a861ebfeff921a45ed43cd429cef

@@ -1,2 +0,0 @@
-x
��A
-�0�a�9���$i2��#��`���D���n?���Z�8�K;UaT���0	9��Rd����D�D�/����w�$^;p�!DL#���D��0/�ݲɟ��O�f�O�S����x��>���<\�Zk��SM��MY7u�'p:�

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

@@ -1 +1 @@
-c1a2676f74b3007ebb101d4d121cecb4850f1378
+92ec47058a2894afbbbd69c5f79bff20c503e686

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

@@ -1,6 +1,6 @@
-0000000000000000000000000000000000000000 e92eec6edb251fbc68435ffd5cd7a52f886f062d CI <CI@example.com> 1617668986 +1000	commit (initial): file0
+0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI <CI@example.com> 1617671409 +1000	commit (initial): file0
-e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI <CI@example.com> 1617668986 +1000	commit: file1
+8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI <CI@example.com> 1617671409 +1000	commit: file1
-76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI <CI@example.com> 1617668986 +1000	commit: file2
+c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI <CI@example.com> 1617671409 +1000	commit: file2
-a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI <CI@example.com> 1617668986 +1000	commit: file1 and file2
+72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI <CI@example.com> 1617671409 +1000	commit: file1 and file2
-2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI <CI@example.com> 1617668986 +1000	commit: file
+b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI <CI@example.com> 1617671409 +1000	commit: file
-ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI <CI@example.com> 1617669005 +1000	commit: test
+231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI <CI@example.com> 1617671428 +1000	commit: test

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

@@ -1,6 +1,6 @@
-0000000000000000000000000000000000000000 e92eec6edb251fbc68435ffd5cd7a52f886f062d CI <CI@example.com> 1617668986 +1000	commit (initial): file0
+0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI <CI@example.com> 1617671409 +1000	commit (initial): file0
-e92eec6edb251fbc68435ffd5cd7a52f886f062d 76ff9510a110483d5de27a6d2c1b1a0e82207431 CI <CI@example.com> 1617668986 +1000	commit: file1
+8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI <CI@example.com> 1617671409 +1000	commit: file1
-76ff9510a110483d5de27a6d2c1b1a0e82207431 a668d8690712ac945055bd187ed70fd10541dd38 CI <CI@example.com> 1617668986 +1000	commit: file2
+c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI <CI@example.com> 1617671409 +1000	commit: file2
-a668d8690712ac945055bd187ed70fd10541dd38 2c7b461ce430e2d743ee239f0c994fd60f90c863 CI <CI@example.com> 1617668986 +1000	commit: file1 and file2
+72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI <CI@example.com> 1617671409 +1000	commit: file1 and file2
-2c7b461ce430e2d743ee239f0c994fd60f90c863 ac8bf479b326a578d74ca8fa9d3a9d2c86188770 CI <CI@example.com> 1617668986 +1000	commit: file
+b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI <CI@example.com> 1617671409 +1000	commit: file
-ac8bf479b326a578d74ca8fa9d3a9d2c86188770 871d1c0423b07670f34db0ca48738dcec548512e CI <CI@example.com> 1617669005 +1000	commit: test
+231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI <CI@example.com> 1617671428 +1000	commit: test

test/integration/filterPath3/expected/.git_keep/objects/76/ff9510a110483d5de27a6d2c1b1a0e82207431

@@ -1,2 +0,0 @@
-x
��M
-�0@a�9E��d�3I@D��ǘN&XhL)<�=��Ƿx�[[��l/���Dd��&���.)�Z�Xg�g��N����lE�,6�)1yj-�K�`kJX

test/integration/filterPath3/expected/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25

@@ -0,0 +1,2 @@
+x
��A
+�0Fa�9����c �U��4���R"x|{��޴�6w�S�
\b6���C*�=W��s�ޠ��]�����0�c_���-�Lk{��!���Y����t��]���
ۛ+�

test/integration/filterPath3/expected/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8

@@ -0,0 +1,3 @@
+x
��K
+�0@]��$3�D��<Ƙ�`�iK����7p�x��+kkS�t��*ĘE�-�s匹�$^���(���d6�u��(EN��R��
+�����[	�ԡ�w�;�����~�m�^��n�
c��l�3Zk�a�����N�"�"�#2_��<{

test/integration/filterPath3/expected/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b

@@ -0,0 +1,3 @@
+x
��M
+�0F]��$?��"BW=�t2����D�������'kkKG��wU(6'����KHu��k	��MH��w}u�`�3*�pt�����fT
+i�������0Np��~�mO���n���);�gg�5=Nu�S7uy�3_	�:n

test/integration/filterPath3/expected/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d

@@ -0,0 +1,3 @@
+x
��M
+�0@a�9�����dE��z�&��`l�<�=��Ƿxem�с���
+EX�g��r*�r�,�Մ���1+f�w}u��<!E�R�����Rkb'Ij&M1;4�����	�q��wn�S/emW �ȑ�8"��S]���뻛7�

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

@@ -1 +1 @@
-871d1c0423b07670f34db0ca48738dcec548512e
+db6681a3e9fb9fb6ef524771cdc763904dd2b54d

test/integration/mergeConflictUndo/expected/.git_keep/MERGE_HEAD

@@ -1 +1 @@
-8f9f24614460289546a49cb6f12a72b764af14f5
+82db6d0e4502f489719ea0f3dbe7e14413c6d28a

test/integration/mergeConflictUndo/expected/.git_keep/ORIG_HEAD

@@ -1 +1 @@
-c622516f02266679505b89103007ec04b8748b67
+8cd762c119834784fdbf97e9bb3b4c15e804ebaa