diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-07-09 13:34:45 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-07-19 13:14:26 +0300 |
| commit | 597f524714cf1bc1ea1b9312b1c1542c3e982365 (patch) | |
| tree | 1d6a239b287c78e9bb5076e08ea6012e99777ac0 /proto/go | |
| parent | 0b40254dac43ef7f1189c30ebb7cd332b47d9f49 (diff) | |
operations: Assert that squashed commits form a line of heritage
When squashing a commit range, then the range should always be from a
parent or grandparent to its child or grandchild. Let's enforce this by
manually checking whether the start commit is an ancestor of the end
commit.
Diffstat (limited to 'proto/go')
| -rw-r--r-- | proto/go/gitalypb/operations.pb.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go index a2b659f63..2b8355807 100644 --- a/proto/go/gitalypb/operations.pb.go +++ b/proto/go/gitalypb/operations.pb.go @@ -2520,7 +2520,7 @@ type UserSquashRequest struct { // two UserSquash RPCs may run with the same ID. SquashId string `protobuf:"bytes,3,opt,name=squash_id,json=squashId,proto3" json:"squash_id,omitempty"` // start_sha is the object ID of the start commit of the range which shall be - // squashed. + // squashed. Must be an ancestor of end_sha. StartSha string `protobuf:"bytes,5,opt,name=start_sha,json=startSha,proto3" json:"start_sha,omitempty"` // end_sha is the object ID of the end commit of the range which shall be // squashed. |