diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2023-11-24 11:02:55 +0300 |
|---|---|---|
| committer | Christian Couder <chriscool@tuxfamily.org> | 2023-11-24 11:02:55 +0300 |
| commit | 3cd2a30b770d3312a1634d8eec49e34a592ef5d7 (patch) | |
| tree | 9bbc7b531f28ae2d97cc7dd72cfa6dc5dd8f850a /proto | |
| parent | aa23b3dadcacb038d914a183a04158d33de7a811 (diff) | |
| parent | b5cd5c1cd065dcd0e600b90c36be312c57c5af70 (diff) | |
Merge branch 'fix-typo-in-commit-files' into 'master'
Fix a typo in UserCommitFilesRequestHeader
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6546
Merged-by: Christian Couder <chriscool@tuxfamily.org>
Approved-by: Christian Couder <chriscool@tuxfamily.org>
Co-authored-by: David Kim <dkim@gitlab.com>
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/go/gitalypb/operations.pb.go | 2 | ||||
| -rw-r--r-- | proto/operations.proto | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go index 333c8b088..ce8526742 100644 --- a/proto/go/gitalypb/operations.pb.go +++ b/proto/go/gitalypb/operations.pb.go @@ -2764,7 +2764,7 @@ type UserCommitFilesRequestHeader struct { // point to the new commit. Force bool `protobuf:"varint,9,opt,name=force,proto3" json:"force,omitempty"` // start_sha specifies the SHA of the commit to use as the parent of new commit. Takes priority - // over start_branch_name and branc_name. Optional. + // over start_branch_name and branch_name. Optional. StartSha string `protobuf:"bytes,10,opt,name=start_sha,json=startSha,proto3" json:"start_sha,omitempty"` // timestamp is the optional timestamp to use for the commits as author and // committer date. If it's not set, the current time will be used. diff --git a/proto/operations.proto b/proto/operations.proto index 4b6264bb7..27a792572 100644 --- a/proto/operations.proto +++ b/proto/operations.proto @@ -831,7 +831,7 @@ message UserCommitFilesRequestHeader { // point to the new commit. bool force = 9; // start_sha specifies the SHA of the commit to use as the parent of new commit. Takes priority - // over start_branch_name and branc_name. Optional. + // over start_branch_name and branch_name. Optional. string start_sha = 10; // timestamp is the optional timestamp to use for the commits as author and // committer date. If it's not set, the current time will be used. |