Add old path to NumStats protobuf output

This will make it possible to solve some N+1 issues in the
/internal/allowed endpoint.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/227572

8 files changed, 83 insertions, 58 deletions

diff --git a/changelogs/unreleased/sh-add-old-path-diffstats.yml b/changelogs/unreleased/sh-add-old-path-diffstats.yml
new file mode 100644
index 000000000..7a66beea2
--- /dev/null
+++ b/changelogs/unreleased/sh-add-old-path-diffstats.yml
@@ -0,0 +1,5 @@
+---
+title: Add old path to NumStats protobuf output
+merge_request: 2395
+author:
+type: changed
diff --git a/internal/diff/numstat.go b/internal/diff/numstat.go
index 7b089daea..ddb9f9ed8 100644
--- a/internal/diff/numstat.go
+++ b/internal/diff/numstat.go
@@ -11,6 +11,7 @@ import (
 // NumStat represents a single parsed diff file change
 type NumStat struct {
 	Path      []byte
+	OldPath   []byte
 	Additions int32
 	Deletions int32
 }
@@ -74,8 +75,8 @@ func (parser *NumStatParser) NextNumStat() (*NumStat, error) {
 	}
 
 	// We are in the rename case. There will be two more zero-terminated
-	// strings: old path and new path. We discard the old path.
-	_, err = parser.reader.ReadBytes(numStatDelimiter)
+	// strings: old path and new path.
+	oldPath, err := parser.reader.ReadBytes(numStatDelimiter)
 	if err != nil {
 		return nil, err
 	}
@@ -86,6 +87,7 @@ func (parser *NumStatParser) NextNumStat() (*NumStat, error) {
 	}
 
 	// Discard trailing zero byte left by ReadBytes
+	result.OldPath = oldPath[:len(oldPath)-1]
 	result.Path = newPath[:len(newPath)-1]
 	return result, nil
 }
diff --git a/internal/diff/numstat_test.go b/internal/diff/numstat_test.go
index 41f07ea89..5f35a234a 100644
--- a/internal/diff/numstat_test.go
+++ b/internal/diff/numstat_test.go
@@ -59,6 +59,12 @@ func TestNumStatParser(t *testing.T) {
 			Additions: 1,
 			Deletions: 5,
 		},
+		{
+			Path:      []byte("files/new.jpg"),
+			OldPath:   []byte("files/original.jpg"),
+			Additions: 0,
+			Deletions: 0,
+		},
 	}
 
 	require.Equal(t, len(expectedStats), len(parsedStats))
diff --git a/internal/diff/testdata/z-numstat.txt b/internal/diff/testdata/z-numstat.txt
index 5d755a557..8ae09ad47 100644
--- a/internal/diff/testdata/z-numstat.txt
+++ b/internal/diff/testdata/z-numstat.txt
diff --git a/internal/service/diff/numstat.go b/internal/service/diff/numstat.go
index 985e3d557..06cccd0db 100644
--- a/internal/service/diff/numstat.go
+++ b/internal/service/diff/numstat.go
@@ -50,6 +50,7 @@ func (s *server) DiffStats(in *gitalypb.DiffStatsRequest, stream gitalypb.DiffSe
 			Additions: stat.Additions,
 			Deletions: stat.Deletions,
 			Path:      stat.Path,
+			OldPath:   stat.OldPath,
 		}
 
 		batch = append(batch, numStat)
diff --git a/proto/diff.proto b/proto/diff.proto
index 383aa01f1..24b728edc 100644
--- a/proto/diff.proto
+++ b/proto/diff.proto
@@ -137,6 +137,7 @@ message DiffStats {
   bytes path = 1;
   int32 additions = 2;
   int32 deletions = 3;
+  bytes old_path = 4;
 }
 
 message DiffStatsResponse {
diff --git a/proto/go/gitalypb/diff.pb.go b/proto/go/gitalypb/diff.pb.go
index de90230e1..f7590c051 100644
--- a/proto/go/gitalypb/diff.pb.go
+++ b/proto/go/gitalypb/diff.pb.go
@@ -736,6 +736,7 @@ type DiffStats struct {
 	Path                 []byte   `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
 	Additions            int32    `protobuf:"varint,2,opt,name=additions,proto3" json:"additions,omitempty"`
 	Deletions            int32    `protobuf:"varint,3,opt,name=deletions,proto3" json:"deletions,omitempty"`
+	OldPath              []byte   `protobuf:"bytes,4,opt,name=old_path,json=oldPath,proto3" json:"old_path,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -787,6 +788,13 @@ func (m *DiffStats) GetDeletions() int32 {
 	return 0
 }
 
+func (m *DiffStats) GetOldPath() []byte {
+	if m != nil {
+		return m.OldPath
+	}
+	return nil
+}
+
 type DiffStatsResponse struct {
 	Stats                []*DiffStats `protobuf:"bytes,1,rep,name=stats,proto3" json:"stats,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
@@ -844,62 +852,63 @@ func init() {
 func init() { proto.RegisterFile("diff.proto", fileDescriptor_686521effc814b25) }
 
 var fileDescriptor_686521effc814b25 = []byte{
-	// 870 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcb, 0x6e, 0xe3, 0x36,
-	0x14, 0x85, 0xfc, 0x8a, 0x7c, 0xad, 0x38, 0x09, 0x53, 0x64, 0x14, 0x4f, 0x17, 0x86, 0x30, 0x0f,
-	0x03, 0x6d, 0x93, 0x41, 0xba, 0x99, 0x45, 0x57, 0x99, 0xa0, 0x45, 0x06, 0x09, 0x1a, 0xa8, 0x8b,
-	0x02, 0xed, 0x42, 0xa0, 0x4d, 0xca, 0x26, 0x2a, 0x89, 0x2e, 0xc9, 0x8e, 0x93, 0x4f, 0xe8, 0x17,
-	0x74, 0xda, 0x1f, 0x28, 0xd0, 0x65, 0x3f, 0xa2, 0xdf, 0x54, 0x74, 0x55, 0xf0, 0x52, 0x92, 0xe5,
-	0x71, 0x30, 0x6b, 0xef, 0x78, 0xcf, 0x39, 0xba, 0xbc, 0x4f, 0x42, 0x00, 0x4c, 0xa4, 0xe9, 0xd9,
-	0x52, 0x49, 0x23, 0x49, 0x6f, 0x2e, 0x0c, 0xcd, 0x1e, 0x46, 0x90, 0x89, 0xc2, 0x38, 0x6c, 0x14,
-	0xe8, 0x05, 0x55, 0x9c, 0x39, 0x2b, 0xfa, 0xab, 0x03, 0x47, 0x6f, 0x64, 0x9e, 0x0b, 0x73, 0x25,
-	0xd2, 0x34, 0xe6, 0x3f, 0xff, 0xc2, 0xb5, 0x21, 0xaf, 0x01, 0x14, 0x5f, 0x4a, 0x2d, 0x8c, 0x54,
-	0x0f, 0xa1, 0x37, 0xf6, 0x26, 0x83, 0x0b, 0x72, 0xe6, 0x9c, 0x9d, 0xc5, 0x35, 0x73, 0xd9, 0x79,
-	0xff, 0xcf, 0xe7, 0x5e, 0xdc, 0xd0, 0x92, 0x67, 0x30, 0xcc, 0x78, 0x6a, 0x92, 0x19, 0xfa, 0x4c,
-	0x04, 0x0b, 0x5b, 0x63, 0x6f, 0xd2, 0x8f, 0x03, 0x8b, 0xba, 0x8b, 0xae, 0x19, 0x79, 0x01, 0x07,
-	0x4a, 0xcc, 0x17, 0x4d, 0x59, 0x1b, 0x65, 0xfb, 0x08, 0xd7, 0xba, 0xd7, 0x10, 0x8a, 0x79, 0x21,
-	0x15, 0x4f, 0x56, 0x0b, 0x61, 0xb8, 0x5e, 0xd2, 0x19, 0x4f, 0x66, 0x0b, 0x5a, 0xcc, 0x79, 0xd8,
-	0x19, 0x7b, 0x13, 0x3f, 0x3e, 0x71, 0xfc, 0xf7, 0x35, 0xfd, 0x06, 0x59, 0xf2, 0x09, 0x74, 0x97,
-	0xd4, 0x2c, 0x74, 0xd8, 0x1d, 0xb7, 0x27, 0x41, 0xec, 0x0c, 0xf2, 0x1c, 0x86, 0x33, 0x99, 0x65,
-	0x74, 0xa9, 0x79, 0x62, 0xcb, 0xa4, 0xc3, 0x1e, 0x7a, 0xd9, 0xaf, 0x50, 0x5b, 0x04, 0x94, 0xf1,
-	0x22, 0x95, 0x6a, 0xc6, 0x93, 0x4c, 0xe4, 0xc2, 0xe8, 0x70, 0xcf, 0xc9, 0x4a, 0xf4, 0x06, 0x41,
-	0xf2, 0x14, 0xfa, 0x39, 0xbd, 0x4f, 0x52, 0x91, 0x71, 0x1d, 0xfa, 0x63, 0x6f, 0xd2, 0x8d, 0xfd,
-	0x9c, 0xde, 0x7f, 0x6d, 0xed, 0x8a, 0xcc, 0x44, 0xc1, 0x75, 0xd8, 0xaf, 0xc9, 0x1b, 0x6b, 0x57,
-	0xe4, 0xf4, 0xc1, 0x70, 0x1d, 0x42, 0x4d, 0x5e, 0x5a, 0xdb, 0x16, 0xc7, 0x92, 0x4b, 0x6a, 0x66,
-	0x8b, 0x52, 0x32, 0x44, 0xc9, 0x7e, 0x4e, 0xef, 0xef, 0x2c, 0xea, 0x74, 0xcf, 0x60, 0xa8, 0x69,
-	0xca, 0x93, 0x75, 0x0c, 0x03, 0x94, 0x05, 0x16, 0xbd, 0xad, 0xe2, 0x68, 0xaa, 0x5c, 0x30, 0xc1,
-	0x86, 0xca, 0x05, 0xd4, 0x54, 0xb9, 0x2b, 0xf7, 0x37, 0x54, 0x78, 0x63, 0xf4, 0x6f, 0x0b, 0x48,
-	0x73, 0x58, 0xf4, 0x52, 0x16, 0x9a, 0xdb, 0x6c, 0x52, 0x25, 0x73, 0x1b, 0xf1, 0x02, 0x87, 0x25,
-	0x88, 0x7d, 0x0b, 0xdc, 0x51, 0xb3, 0x20, 0x4f, 0x60, 0xcf, 0x48, 0x47, 0xb5, 0x90, 0xea, 0x19,
-	0x59, 0x11, 0xf8, 0x55, 0xdd, 0xfb, 0x9e, 0x35, 0xaf, 0x19, 0x39, 0x86, 0xae, 0x91, 0x16, 0xee,
-	0x20, 0xdc, 0x31, 0xf2, 0x9a, 0x91, 0x53, 0xf0, 0x65, 0xc6, 0x92, 0x5c, 0x32, 0x1e, 0x76, 0x31,
-	0xb4, 0x3d, 0x99, 0xb1, 0x5b, 0xc9, 0xb8, 0xa5, 0x0a, 0xbe, 0x72, 0x54, 0xcf, 0x51, 0x05, 0x5f,
-	0x21, 0x75, 0x02, 0xbd, 0xa9, 0x28, 0xa8, 0x7a, 0x28, 0x1b, 0x58, 0x5a, 0x36, 0x5d, 0x45, 0x57,
-	0x65, 0x89, 0x19, 0x35, 0x14, 0x3b, 0x14, 0xc4, 0x81, 0xa2, 0x2b, 0xac, 0xf0, 0x15, 0x35, 0x94,
-	0x8c, 0x21, 0xe0, 0x05, 0x4b, 0x64, 0xea, 0x84, 0xd8, 0x28, 0x3f, 0x06, 0x5e, 0xb0, 0x6f, 0x53,
-	0x54, 0x91, 0x97, 0x70, 0x20, 0xdf, 0x71, 0x95, 0x66, 0x72, 0x95, 0xe4, 0x54, 0xfd, 0xc4, 0x15,
-	0xf6, 0xc0, 0x8f, 0x87, 0x15, 0x7c, 0x8b, 0x28, 0xf9, 0x14, 0xfa, 0xd5, 0x88, 0x31, 0x6c, 0x80,
-	0x1f, 0xaf, 0x01, 0x5b, 0x40, 0x23, 0x65, 0x92, 0x51, 0x35, 0xe7, 0x58, 0x78, 0x3f, 0xf6, 0x8d,
-	0x94, 0x37, 0xd6, 0x7e, 0xdb, 0xf1, 0xfd, 0xc3, 0x7e, 0xf4, 0xb7, 0x57, 0x97, 0x9e, 0x67, 0x86,
-	0xee, 0xda, 0xa2, 0xd6, 0xeb, 0xd6, 0x69, 0xac, 0x5b, 0xf4, 0xa7, 0x07, 0x83, 0x46, 0xd0, 0xbb,
-	0x3b, 0x28, 0xd1, 0x25, 0x1c, 0x6f, 0x54, 0xb7, 0x9c, 0xec, 0xcf, 0xa0, 0xc7, 0x2c, 0xa0, 0x43,
-	0x6f, 0xdc, 0x9e, 0x0c, 0x2e, 0x8e, 0xab, 0xd2, 0x36, 0xc5, 0xa5, 0x24, 0x7a, 0xef, 0xc1, 0x30,
-	0xa6, 0xab, 0x1d, 0x7c, 0x47, 0xa3, 0xe7, 0x70, 0x50, 0x47, 0x56, 0xa6, 0x46, 0xa0, 0x83, 0x83,
-	0xef, 0xda, 0x80, 0xe7, 0xe8, 0x77, 0x0f, 0x75, 0x38, 0xdb, 0xbb, 0x96, 0xc2, 0x0b, 0x38, 0x5c,
-	0x87, 0xf6, 0x91, 0x1c, 0xfe, 0xf0, 0xe0, 0xd0, 0x26, 0xfa, 0x9d, 0xa1, 0x46, 0xef, 0x5a, 0x12,
-	0x3f, 0x42, 0xbf, 0x8e, 0xcd, 0x46, 0xdf, 0x58, 0x04, 0x3c, 0xdb, 0x77, 0x82, 0x32, 0x26, 0x8c,
-	0x90, 0x85, 0xc6, 0x9b, 0xba, 0xf1, 0x1a, 0xb0, 0x2c, 0xe3, 0x19, 0x77, 0x6c, 0xdb, 0xb1, 0x35,
-	0x10, 0x7d, 0x05, 0x47, 0x8d, 0xc4, 0xcb, 0x12, 0xbd, 0x84, 0xae, 0xb6, 0x40, 0x39, 0xc0, 0x47,
-	0x55, 0xd2, 0x6b, 0xa5, 0xe3, 0x2f, 0x7e, 0x6d, 0xc3, 0x00, 0x41, 0xae, 0xde, 0x89, 0x19, 0x27,
-	0xb7, 0x00, 0xeb, 0xa7, 0x9e, 0x9c, 0x7e, 0x30, 0xf8, 0xeb, 0x19, 0x1f, 0x8d, 0x1e, 0xa3, 0xdc,
-	0xed, 0x51, 0xef, 0xbf, 0xdf, 0x26, 0x2d, 0xbf, 0xf5, 0xca, 0x23, 0x77, 0x9b, 0x2f, 0xc1, 0xe8,
-	0xb1, 0x45, 0x2a, 0x1d, 0x3e, 0x7d, 0x94, 0xdb, 0xf2, 0x78, 0x05, 0x7b, 0xe5, 0x4c, 0x93, 0x93,
-	0xba, 0x95, 0x1b, 0xeb, 0x37, 0x7a, 0xb2, 0x85, 0x6f, 0x79, 0xf9, 0x06, 0xfc, 0x6a, 0xac, 0x48,
-	0x53, 0xde, 0xdc, 0x81, 0x51, 0xb8, 0x4d, 0x6c, 0x39, 0x7a, 0xdb, 0x6c, 0x6d, 0xb8, 0x5d, 0xe6,
-	0xd2, 0xd5, 0xe9, 0x23, 0xcc, 0x87, 0xbe, 0x2e, 0x5f, 0xfd, 0x60, 0x55, 0x19, 0x9d, 0x9e, 0xcd,
-	0x64, 0x7e, 0xee, 0x8e, 0x5f, 0x48, 0x35, 0x3f, 0x77, 0xdf, 0x9e, 0xe3, 0xaf, 0xdb, 0xf9, 0x5c,
-	0x96, 0xf6, 0x72, 0x3a, 0xed, 0x21, 0xf4, 0xe5, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x87, 0xd9,
-	0x49, 0xa7, 0xfd, 0x09, 0x00, 0x00,
+	// 882 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xe3, 0x36,
+	0x10, 0x86, 0x6c, 0x59, 0x91, 0xc7, 0x8a, 0x93, 0x30, 0x45, 0x56, 0xf1, 0xf6, 0x60, 0x08, 0xfb,
+	0x63, 0xa0, 0x6d, 0xb2, 0x48, 0x2f, 0x7b, 0xe8, 0x29, 0x1b, 0xb4, 0xc8, 0x22, 0x41, 0x03, 0xf5,
+	0x50, 0xa0, 0x17, 0x81, 0x36, 0x29, 0x9b, 0xa8, 0x24, 0xba, 0x22, 0x1b, 0x27, 0x8f, 0xd0, 0x27,
+	0xe8, 0xb6, 0x2f, 0x50, 0xa0, 0xc7, 0x3e, 0x44, 0x9f, 0xa9, 0xe8, 0xa9, 0xe0, 0x50, 0x92, 0xe5,
+	0x75, 0xd0, 0xb3, 0x6f, 0x9a, 0xef, 0xfb, 0x34, 0x1c, 0x7e, 0x33, 0x23, 0x1b, 0x80, 0x89, 0x34,
+	0x3d, 0x5b, 0x96, 0x52, 0x4b, 0xe2, 0xcd, 0x85, 0xa6, 0xd9, 0xe3, 0x08, 0x32, 0x51, 0x68, 0x8b,
+	0x8d, 0x02, 0xb5, 0xa0, 0x25, 0x67, 0x36, 0x8a, 0xfe, 0x74, 0xe1, 0xe8, 0x9d, 0xcc, 0x73, 0xa1,
+	0xaf, 0x44, 0x9a, 0xc6, 0xfc, 0xa7, 0x9f, 0xb9, 0xd2, 0xe4, 0x2d, 0x40, 0xc9, 0x97, 0x52, 0x09,
+	0x2d, 0xcb, 0xc7, 0xd0, 0x19, 0x3b, 0x93, 0xc1, 0x05, 0x39, 0xb3, 0xc9, 0xce, 0xe2, 0x86, 0xb9,
+	0x74, 0x3f, 0xfc, 0xfd, 0xb9, 0x13, 0xb7, 0xb4, 0xe4, 0x05, 0x0c, 0x33, 0x9e, 0xea, 0x64, 0x86,
+	0x39, 0x13, 0xc1, 0xc2, 0xce, 0xd8, 0x99, 0xf4, 0xe3, 0xc0, 0xa0, 0xf6, 0xa0, 0x6b, 0x46, 0x5e,
+	0xc1, 0x41, 0x29, 0xe6, 0x8b, 0xb6, 0xac, 0x8b, 0xb2, 0x7d, 0x84, 0x1b, 0xdd, 0x5b, 0x08, 0xc5,
+	0xbc, 0x90, 0x25, 0x4f, 0x56, 0x0b, 0xa1, 0xb9, 0x5a, 0xd2, 0x19, 0x4f, 0x66, 0x0b, 0x5a, 0xcc,
+	0x79, 0xe8, 0x8e, 0x9d, 0x89, 0x1f, 0x9f, 0x58, 0xfe, 0xfb, 0x86, 0x7e, 0x87, 0x2c, 0xf9, 0x04,
+	0x7a, 0x4b, 0xaa, 0x17, 0x2a, 0xec, 0x8d, 0xbb, 0x93, 0x20, 0xb6, 0x01, 0x79, 0x09, 0xc3, 0x99,
+	0xcc, 0x32, 0xba, 0x54, 0x3c, 0x31, 0x36, 0xa9, 0xd0, 0xc3, 0x2c, 0xfb, 0x35, 0x6a, 0x4c, 0x40,
+	0x19, 0x2f, 0x52, 0x59, 0xce, 0x78, 0x92, 0x89, 0x5c, 0x68, 0x15, 0xee, 0x59, 0x59, 0x85, 0xde,
+	0x20, 0x48, 0x9e, 0x43, 0x3f, 0xa7, 0x0f, 0x49, 0x2a, 0x32, 0xae, 0x42, 0x7f, 0xec, 0x4c, 0x7a,
+	0xb1, 0x9f, 0xd3, 0x87, 0xaf, 0x4d, 0x5c, 0x93, 0x99, 0x28, 0xb8, 0x0a, 0xfb, 0x0d, 0x79, 0x63,
+	0xe2, 0x9a, 0x9c, 0x3e, 0x6a, 0xae, 0x42, 0x68, 0xc8, 0x4b, 0x13, 0x1b, 0x73, 0x0c, 0xb9, 0xa4,
+	0x7a, 0xb6, 0xa8, 0x24, 0x43, 0x94, 0xec, 0xe7, 0xf4, 0xe1, 0xce, 0xa0, 0x56, 0xf7, 0x02, 0x86,
+	0x8a, 0xa6, 0x3c, 0x59, 0xd7, 0x30, 0x40, 0x59, 0x60, 0xd0, 0xdb, 0xba, 0x8e, 0xb6, 0xca, 0x16,
+	0x13, 0x6c, 0xa8, 0x6c, 0x41, 0x6d, 0x95, 0x3d, 0x72, 0x7f, 0x43, 0x85, 0x27, 0x46, 0xff, 0x74,
+	0x80, 0xb4, 0x87, 0x45, 0x2d, 0x65, 0xa1, 0xb8, 0xb9, 0x4d, 0x5a, 0xca, 0xdc, 0x54, 0xbc, 0xc0,
+	0x61, 0x09, 0x62, 0xdf, 0x00, 0x77, 0x54, 0x2f, 0xc8, 0x33, 0xd8, 0xd3, 0xd2, 0x52, 0x1d, 0xa4,
+	0x3c, 0x2d, 0x6b, 0x02, 0xdf, 0x6a, 0x7a, 0xef, 0x99, 0xf0, 0x9a, 0x91, 0x63, 0xe8, 0x69, 0x69,
+	0x60, 0x17, 0x61, 0x57, 0xcb, 0x6b, 0x46, 0x4e, 0xc1, 0x97, 0x19, 0x4b, 0x72, 0xc9, 0x78, 0xd8,
+	0xc3, 0xd2, 0xf6, 0x64, 0xc6, 0x6e, 0x25, 0xe3, 0x86, 0x2a, 0xf8, 0xca, 0x52, 0x9e, 0xa5, 0x0a,
+	0xbe, 0x42, 0xea, 0x04, 0xbc, 0xa9, 0x28, 0x68, 0xf9, 0x58, 0x35, 0xb0, 0x8a, 0xcc, 0x75, 0x4b,
+	0xba, 0xaa, 0x2c, 0x66, 0x54, 0x53, 0xec, 0x50, 0x10, 0x07, 0x25, 0x5d, 0xa1, 0xc3, 0x57, 0x54,
+	0x53, 0x32, 0x86, 0x80, 0x17, 0x2c, 0x91, 0xa9, 0x15, 0x62, 0xa3, 0xfc, 0x18, 0x78, 0xc1, 0xbe,
+	0x4d, 0x51, 0x45, 0x5e, 0xc3, 0x81, 0xbc, 0xe7, 0x65, 0x9a, 0xc9, 0x55, 0x92, 0xd3, 0xf2, 0x47,
+	0x5e, 0x62, 0x0f, 0xfc, 0x78, 0x58, 0xc3, 0xb7, 0x88, 0x92, 0x4f, 0xa1, 0x5f, 0x8f, 0x18, 0xc3,
+	0x06, 0xf8, 0xf1, 0x1a, 0x30, 0x06, 0x6a, 0x29, 0x93, 0x8c, 0x96, 0x73, 0x8e, 0xc6, 0xfb, 0xb1,
+	0xaf, 0xa5, 0xbc, 0x31, 0xf1, 0x7b, 0xd7, 0xf7, 0x0f, 0xfb, 0xd1, 0x5f, 0x4e, 0x63, 0x3d, 0xcf,
+	0x34, 0xdd, 0xb5, 0x45, 0x6d, 0xd6, 0xcd, 0x6d, 0xad, 0x5b, 0xf4, 0x87, 0x03, 0x83, 0x56, 0xd1,
+	0xbb, 0x3b, 0x28, 0xd1, 0x25, 0x1c, 0x6f, 0xb8, 0x5b, 0x4d, 0xf6, 0x67, 0xe0, 0x31, 0x03, 0xa8,
+	0xd0, 0x19, 0x77, 0x27, 0x83, 0x8b, 0xe3, 0xda, 0xda, 0xb6, 0xb8, 0x92, 0x44, 0x1f, 0x1c, 0x18,
+	0xc6, 0x74, 0xb5, 0x83, 0xdf, 0xd1, 0xe8, 0x25, 0x1c, 0x34, 0x95, 0x55, 0x57, 0x23, 0xe0, 0xe2,
+	0xe0, 0xdb, 0x36, 0xe0, 0x73, 0xf4, 0x9b, 0x83, 0x3a, 0x9c, 0xed, 0x5d, 0xbb, 0xc2, 0x2b, 0x38,
+	0x5c, 0x97, 0xf6, 0x3f, 0x77, 0xf8, 0xdd, 0x81, 0x43, 0x73, 0xd1, 0xef, 0x34, 0xd5, 0x6a, 0xd7,
+	0x2e, 0x71, 0x0f, 0xfd, 0xa6, 0x36, 0x53, 0x7d, 0x6b, 0x11, 0xf0, 0xd9, 0x7c, 0x27, 0x28, 0x63,
+	0x42, 0x0b, 0x59, 0x28, 0x3c, 0xa9, 0x17, 0xaf, 0x01, 0xc3, 0x32, 0x9e, 0x71, 0xcb, 0x76, 0x2d,
+	0xdb, 0x00, 0xf5, 0xe4, 0x63, 0x4e, 0x17, 0x73, 0x9a, 0xc9, 0x37, 0x2b, 0x14, 0x7d, 0x05, 0x47,
+	0x2d, 0x4f, 0x2a, 0xf7, 0x5e, 0x43, 0x4f, 0x19, 0xa0, 0x9a, 0xed, 0xa3, 0xda, 0x8f, 0xb5, 0xd2,
+	0xf2, 0x17, 0xbf, 0x74, 0x61, 0x80, 0x20, 0x2f, 0xef, 0xc5, 0x8c, 0x93, 0x5b, 0x80, 0xf5, 0xaf,
+	0x00, 0x39, 0xfd, 0x68, 0x27, 0xd6, 0xe3, 0x3f, 0x1a, 0x3d, 0x45, 0xd9, 0xd3, 0x23, 0xef, 0xdf,
+	0x5f, 0x27, 0x1d, 0xbf, 0xf3, 0xc6, 0x21, 0x77, 0x9b, 0x1f, 0x89, 0xd1, 0x53, 0x3b, 0x56, 0x25,
+	0x7c, 0xfe, 0x24, 0xb7, 0x95, 0xf1, 0x0a, 0xf6, 0xaa, 0x71, 0x27, 0x27, 0x4d, 0x97, 0x37, 0x36,
+	0x73, 0xf4, 0x6c, 0x0b, 0xdf, 0xca, 0xf2, 0x0d, 0xf8, 0xf5, 0xc4, 0x91, 0xb6, 0xbc, 0xbd, 0x1e,
+	0xa3, 0x70, 0x9b, 0xd8, 0x4a, 0xf4, 0xbe, 0xdd, 0xf5, 0x70, 0xdb, 0xe6, 0x2a, 0xd5, 0xe9, 0x13,
+	0xcc, 0xc7, 0xb9, 0x2e, 0xdf, 0xfc, 0x60, 0x54, 0x19, 0x9d, 0x9e, 0xcd, 0x64, 0x7e, 0x6e, 0x1f,
+	0xbf, 0x90, 0xe5, 0xfc, 0xdc, 0xbe, 0x7b, 0x8e, 0xff, 0xea, 0xce, 0xe7, 0xb2, 0x8a, 0x97, 0xd3,
+	0xa9, 0x87, 0xd0, 0x97, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x98, 0x12, 0xa9, 0x58, 0x18, 0x0a,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/ruby/proto/gitaly/diff_pb.rb b/ruby/proto/gitaly/diff_pb.rb
index d65970553..8f8940902 100644
--- a/ruby/proto/gitaly/diff_pb.rb
+++ b/ruby/proto/gitaly/diff_pb.rb
@@ -78,6 +78,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :path, :bytes, 1
     optional :additions, :int32, 2
     optional :deletions, :int32, 3
+    optional :old_path, :bytes, 4
   end
   add_message "gitaly.DiffStatsResponse" do
     repeated :stats, :message, 1, "gitaly.DiffStats"