Add merge files files to GetCommitFileStatus

modules/git/commit.go

@@ -495,7 +495,7 @@ func GetCommitFileStatus(ctx context.Context, repoPath, commitID string) (*Commi
 	}()
 
 	stderr := new(bytes.Buffer)
-	err := NewCommand(ctx, "log", "--name-status", "-c", "--pretty=format:", "--parents", "--no-renames", "-z", "-1").AddDynamicArguments(commitID).Run(&RunOpts{
+	err := NewCommand(ctx, "log", "--name-status", "-m", "--pretty=format:", "--first-parent", "--no-renames", "-z", "-1").AddDynamicArguments(commitID).Run(&RunOpts{
 		Dir:    repoPath,
 		Stdout: w,
 		Stderr: stderr,

modules/git/commit_test.go

@@ -255,3 +255,26 @@ func TestParseCommitFileStatus(t *testing.T) {
 		assert.Equal(t, kase.modified, fileStatus.Modified)
 	}
 }
+
+func TestGetCommitFileStatusMerges(t *testing.T) {
+	bareRepo1Path := filepath.Join(testReposDir, "repo6_merge")
+
+	commitFileStatus, err := GetCommitFileStatus(DefaultContext, bareRepo1Path, "022f4ce6214973e018f02bf363bf8a2e3691f699")
+	assert.NoError(t, err)
+
+	expected := CommitFileStatus{
+		[]string{
+			"add_file.txt",
+		},
+		[]string{
+			"to_remove.txt",
+		},
+		[]string{
+			"to_modify.txt",
+		},
+	}
+
+	assert.Equal(t, commitFileStatus.Added, expected.Added)
+	assert.Equal(t, commitFileStatus.Removed, expected.Removed)
+	assert.Equal(t, commitFileStatus.Modified, expected.Modified)
+}

modules/git/tests/repos/repo6_merge/HEAD

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

modules/git/tests/repos/repo6_merge/objects/37/d35c7ed39e4e16d0b579a5b995b7e30b0e9411

@@ -0,0 +1,2 @@
+x
��M
+1�a�=E��$��LAī�'�
��i��R���g�~_��u1��N��@mZ)g�2�D�j��*_�f��s�4��a�m�np>�����>!��#���1�;p]�x��uyIw�N4�

modules/git/tests/repos/repo6_merge/objects/38/ec3e0cdc88bde01014bda4a5dd9fc835f41439

@@ -0,0 +1,2 @@
+x
��M
+�0�a�9����M2 �U����=���yv/��� ��0:@��$��UѬ�.�[�>� �l��I�s�x��8'T��R�ĤS,��$x.֚�=n[��נ��u�s!+9���BGv�f�m���u���r����>�

modules/git/tests/repos/repo6_merge/objects/ae/4b035e7c4afbc000576cee3f713ea0c2f1e1e2

@@ -0,0 +1,5 @@
+x
��M
+1@a�=E���?i�*m��
Ǒ�xO���=x�.�l��O��R�Z80��\[�*�%�b
+�&q��� �I��Ț�灝
+7��ԋF쨜�w�c�u���zx?����0�
+�1 :�m���6L�S���>&

modules/git/tests/repos/repo6_merge/refs/heads/main

@@ -0,0 +1 @@
+022f4ce6214973e018f02bf363bf8a2e3691f699

modules/git/tests/repos/repo6_merge/refs/heads/merge/add_file

@@ -0,0 +1 @@
+ae4b035e7c4afbc000576cee3f713ea0c2f1e1e2

modules/git/tests/repos/repo6_merge/refs/heads/merge/modify_file

@@ -0,0 +1 @@
+d1792641396ff7630d35fbb0b74b86b0c71bca77

modules/git/tests/repos/repo6_merge/refs/heads/merge/remove_file

@@ -0,0 +1 @@
+38ec3e0cdc88bde01014bda4a5dd9fc835f41439