cleaner protobuf generation

Author: sqs

diff/diff.go

@@ -4,9 +4,7 @@ import "bytes"
 
 // NOTE: types are code-generated in diff.pb.go.
 
-//go:generate protoc -I../../../../github.com/gogo/protobuf/protobuf -I../../../../github.com/gogo/protobuf -I../../../../sourcegraph.com/sqs/pbtypes -I. --gogo_out=. diff.proto
-//go:generate sed -i "s#timestamp\\.pb#sourcegraph.com/sqs/pbtypes#g" diff.pb.go
-//go:generate sed -i "s#vcs\\.pb#sourcegraph.com/sourcegraph/go-vcs/vcs#g" diff.pb.go
+//go:generate protoc -I../../../.. -I ../../../../github.com/gogo/protobuf/protobuf -I. --gogo_out=. diff.proto
 
 // Stat computes the number of lines added/changed/deleted in all
 // hunks in this file's diff.

diff/diff.pb.go

@@ -1,9 +1,8 @@
 syntax = "proto3";
 package diff;
 
-import "gogoproto/gogo.proto";
-import "timestamp.proto";
-
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "sourcegraph.com/sqs/pbtypes/timestamp.proto";
 
 // A FileDiff represents a unified diff for a single file.
 //