plumbing/object: Support mergetag in merge commits #847

adityasaky · 2023-09-27T16:00:08Z

When a merge commit is created from merging a signed tag, the tag object is embedded in the commit object. This commit adds support for this tag data when encoding and decoding a commit object.

It might be possible to embed the Tag struct in the Commit struct. However, that will also require additions to the tag object to use reader / writer, like the Signature object currently does.

NOTE: I haven't included any tests as I'm currently unfamiliar with the test workflow used in this repo. Some pointers would be appreciated!

adityasaky · 2023-09-27T16:06:17Z

Here's an example of a commit that includes the mergetag field: torvalds/linux@cac405a.

[linux] $ git cat-file -p cac405a3bfa21a6e17089ae2f355f34594bfb543
tree d2d33b5eea7df14b5c2e5cd49304f957837e3321
parent 50768a425b46ad7d98f6d88c22d41aa026c463cf
parent b4c639f699349880b7918b861e1bd360442ec450
author Linus Torvalds <torvalds@linux-foundation.org> 1695746648 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1695746648 -0700
mergetag object b4c639f699349880b7918b861e1bd360442ec450
 type commit
 tag for-6.6-rc3-tag
 tagger David Sterba <dsterba@suse.com> 1695661654 +0200
 
 for-6.6-rc3-tag
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE8rQSAMVO+zA4DBdWxWXV+ddtWDsFAmURvloACgkQxWXV+ddt
 WDt+CQ/+NgBtQn7eyABsdHzXWPxpFyGZrdw5ldKnly3G+WDW2GKMaZ6CpDuEZGNQ
 vMAkSGX5LIHXvO79pDnGG0i+bRINWrc5HZVZ/p5Da6wplBTgIPlbLmxaZX9MJLbx
 j7Oz37GXiQJY8BxnVCnsb+bhhTrTbO9HFUQr/nxefIvu22OBdL1WXYcfuBOeEsFG
 qr/aeC52YqCVgXvt+8a5DqAKE0NWc4PFMFUMo4vlf1xuL652fvff7xiup1CAIgBh
 qsCa17E7q+qjri2phAhbFNadfpH5wGfyjTWScOlaFuXjRhW2v2oqz3WU5IQj4dmu
 PI+k++PLUzIxT0IcjD1YbZzRFaEI6fR2W0GA4LK08fjVehh2ao5jOjtRgLl8HlqG
 qC5fslAPzUxRmwMmCjSGfXF14sgtyLy8eVWf69xn06/1cbEmfHDrWNXP1QHuq6eT
 Jqy8Ywia3jRzzfZ1utABJPLBW4hFQKkyobtyd67fxslUFmtuLvLqGTiOdmVFiD9K
 o+BF2xjEz2n8O1+aRZk5SFNC9zcaASaRg/wQrhvSI9qxM18fh4TXgKQOniLzAK7v
 lZc+JkegFW4CVquCUpmbsdZAOpVNRXfPOJIt/w6G+oRbaiTvPUnrH+uyq8IGREbw
 E7d8XIP0qlF0DQBGK4Mw/riZz/e5MmEKNjza6M+fj2uglpfWTv4=
 =6WEW
 -----END PGP SIGNATURE-----

Merge tag 'for-6.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:

 - delayed refs fixes:
     - fix race when refilling delayed refs block reserve
     - prevent transaction block reserve underflow when starting
       transaction
     - error message and value adjustments

 - fix build warnings with CONFIG_CC_OPTIMIZE_FOR_SIZE and
   -Wmaybe-uninitialized

 - fix for smatch report where uninitialized data from invalid extent
   buffer range could be returned to the caller

 - fix numeric overflow in statfs when calculating lower threshold
   for a full filesystem

* tag 'for-6.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: initialize start_slot in btrfs_log_prealloc_extents
  btrfs: make sure to initialize start and len in find_free_dev_extent
  btrfs: reset destination buffer when read_extent_buffer() gets invalid range
  btrfs: properly report 0 avail for very full file systems
  btrfs: log message if extent item not found when running delayed extent op
  btrfs: remove redundant BUG_ON() from __btrfs_inc_extent_ref()
  btrfs: return -EUCLEAN for delayed tree ref with a ref count not equals to 1
  btrfs: prevent transaction block reserve underflow when starting transaction
  btrfs: fix race when refilling delayed refs block reserve

I also created a version where the merge commit is also signed.

[test-signed-tag-merge] $ git cat-file -p HEAD
tree dcc0f810d1e7315d4c8e9c1f6fae99e8b161ae25
parent 58eb27c1bd5696ab45b9cdc054d7e12feca003fb
parent 7b6ed05bc0895f7453564f12f2f719f3a3b52031
author Aditya Sirish <aditya@saky.in> 1695827930 -0400
committer Aditya Sirish <aditya@saky.in> 1695827930 -0400
mergetag object 7b6ed05bc0895f7453564f12f2f719f3a3b52031
 type commit
 tag change
 tagger Aditya Sirish <aditya@saky.in> 1695827841 -0400

 change
 -----BEGIN PGP SIGNATURE-----

 iQEzBAABCAAdFiEE4ylBKZy4wNk9zyesuDEQ0BJUVgQFAmUUR4EACgkQuDEQ0BJU
 VgSZaAgAwn3StCshXDozuq7bZj4R8T+HjEDwpjqASoq5mS2rTo4sweTDpXvzBTWX
 IzugCHlpdAEhImj35VzJLpi2FPiVrhwLS5N/gCAIUpdPvu1oqNN7e6v9P6UOTBIM
 vcgRm04UR3H2Ov2cCTji8URnivBAToHnd1ucosexS+VkiViK5xtiS403kDLFPWbG
 CraB3s+4MRhSA7XnBo2Oc8Mg+9c7p7hjjHg6Xmt34yl8/Gr/QwOWhBj9KZJAYpM/
 3ech1fvpkagSjf8MnK4LGartCnRuidT2r5HKBxsEL3PPghuqmSvaAGDSoQVRpPlT
 ug53KhQhMpi0Wo1ibkiovYT+iNNbJQ==
 =0jbQ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----

 iQEzBAABCAAdFiEE4ylBKZy4wNk9zyesuDEQ0BJUVgQFAmUUR+AACgkQuDEQ0BJU
 VgQDXQgAh9IDVPPmDLnLxtZ2YnIVwbrL2oj73mKlt84mUXij/TPVpZ8D7V5NUaSG
 OTZ9amKd+iBIpDsL5UJJj5Fnm24sybNZrbfDaXCCvoBgSb2CFySALPuVMNkfcY/C
 FxWKUcGxkNqdYB9X7g/U9YB/7+hsKwuPgaOf7abLXiJsftjmvWSIt9dPSsoQr3GM
 OBIbpRkhERK1AhyREwBlTPnn0k7MivaLZjoQ9c8GyBJPP3cGe+9kUmbZCGAlj9Kv
 Rxu2SCv+n7ReEAm/E3HFkQHrhzwHbs82B0m+yDWiYI23EQeMdPFjBx2hABxty+eS
 LvTjgw4FelsMndjtw+dmucn7Py8P7A==
 =vydX
 -----END PGP SIGNATURE-----

Merge tag 'change'

change

pjbgf · 2023-09-27T18:50:25Z

@adityasaky nice PR!

The majority of our tests use gocheck. But feel free to go standard Golang if that is more convenient as we may move on from gocheck as it is no longer maintained.

plumbing/object/commit_test.go has some examples for signature related tests.

If you want to do state based tests, you could also add a new fixture at go-git/go-git-fixtures and then fetch it by tag for example but that is not a hard requirement.

plumbing/object/commit.go

adityasaky · 2023-09-27T19:33:13Z

@pjbgf I added a simple test with a sample tag object's representation. Let me know what you think!

plumbing/object/commit.go

pjbgf · 2023-09-27T20:11:39Z

@adityasaky please squash the commits.

When a merge commit is created from merging a signed tag, the tag object is embedded in the commit object. This commit adds support for this tag data when encoding and decoding a commit object. Signed-off-by: Aditya Sirish <aditya@saky.in>

adityasaky · 2023-09-27T20:29:18Z

Added a link to the signature format and cleaned up commit history.

pjbgf

@adityasaky great job, thank you for working on this. 🙇

adityasaky · 2023-09-27T22:29:14Z

Thanks for the quick merge!

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/go-git/go-git/v5](https://togithub.com/go-git/go-git) | require | minor | `v5.9.0` -> `v5.10.0` | | [github.com/ianlancetaylor/demangle](https://togithub.com/ianlancetaylor/demangle) | require | digest | `eabc099` -> `e2daf7b` | | [github.com/jedib0t/go-pretty/v6](https://togithub.com/jedib0t/go-pretty) | require | patch | `v6.4.8` -> `v6.4.9` | --- ### Release Notes <details> <summary>go-git/go-git (github.com/go-git/go-git/v5)</summary> ### [`v5.10.0`](https://togithub.com/go-git/go-git/releases/tag/v5.10.0) [Compare Source](https://togithub.com/go-git/go-git/compare/v5.9.0...v5.10.0) #### What's Changed - PlainInitOptions.Bare and allow using InitOptions with PlainInitWithOptions by [@ThinkChaos](https://togithub.com/ThinkChaos) in [https://github.com/go-git/go-git/pull/782](https://togithub.com/go-git/go-git/pull/782) - Worktree, apply ProxyOption on Pull by [@nodivbyzero](https://togithub.com/nodivbyzero) in [https://github.com/go-git/go-git/pull/840](https://togithub.com/go-git/go-git/pull/840) - Repository: add clone --shared feature by [@enverbisevac](https://togithub.com/enverbisevac) in [https://github.com/go-git/go-git/pull/860](https://togithub.com/go-git/go-git/pull/860) - build: Add github workflow to check commit message format by [@pjbgf](https://togithub.com/pjbgf) in [https://github.com/go-git/go-git/pull/867](https://togithub.com/go-git/go-git/pull/867) - Improve handling of remote errors by [@makkes](https://togithub.com/makkes) in [https://github.com/go-git/go-git/pull/866](https://togithub.com/go-git/go-git/pull/866) - build(deps): bump golang.org/x/net from 0.15.0 to 0.17.0 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/go-git/go-git/pull/873](https://togithub.com/go-git/go-git/pull/873) - plumbing: commitgraph, Add generation v2 support by [@zeripath](https://togithub.com/zeripath) in [https://github.com/go-git/go-git/pull/869](https://togithub.com/go-git/go-git/pull/869) - plumbing: protocol/packp, Add validation for decodeLine by [@pjbgf](https://togithub.com/pjbgf) in [https://github.com/go-git/go-git/pull/868](https://togithub.com/go-git/go-git/pull/868) - plumbing: parse the encoding header of the commit object by [@liwenqiu](https://togithub.com/liwenqiu) in [https://github.com/go-git/go-git/pull/761](https://togithub.com/go-git/go-git/pull/761) - plumbing: commitgraph, allow SHA256 commit-graphs by [@zeripath](https://togithub.com/zeripath) in [https://github.com/go-git/go-git/pull/853](https://togithub.com/go-git/go-git/pull/853) - plumbing: commitgraph, Allow reading commit-graph chains by [@zeripath](https://togithub.com/zeripath) in [https://github.com/go-git/go-git/pull/854](https://togithub.com/go-git/go-git/pull/854) - plumbing/object: Support mergetag in merge commits by [@adityasaky](https://togithub.com/adityasaky) in [https://github.com/go-git/go-git/pull/847](https://togithub.com/go-git/go-git/pull/847) #### New Contributors - [@nodivbyzero](https://togithub.com/nodivbyzero) made their first contribution in [https://github.com/go-git/go-git/pull/840](https://togithub.com/go-git/go-git/pull/840) - [@adityasaky](https://togithub.com/adityasaky) made their first contribution in [https://github.com/go-git/go-git/pull/847](https://togithub.com/go-git/go-git/pull/847) - [@hezhizhen](https://togithub.com/hezhizhen) made their first contribution in [https://github.com/go-git/go-git/pull/836](https://togithub.com/go-git/go-git/pull/836) - [@0x34d](https://togithub.com/0x34d) made their first contribution in [https://github.com/go-git/go-git/pull/855](https://togithub.com/go-git/go-git/pull/855) - [@liwenqiu](https://togithub.com/liwenqiu) made their first contribution in [https://github.com/go-git/go-git/pull/761](https://togithub.com/go-git/go-git/pull/761) - [@enverbisevac](https://togithub.com/enverbisevac) made their first contribution in [https://github.com/go-git/go-git/pull/860](https://togithub.com/go-git/go-git/pull/860) - [@makkes](https://togithub.com/makkes) made their first contribution in [https://github.com/go-git/go-git/pull/866](https://togithub.com/go-git/go-git/pull/866) **Full Changelog**: go-git/go-git@v5.9.0...v5.10.0 </details> <details> <summary>jedib0t/go-pretty (github.com/jedib0t/go-pretty/v6)</summary> ### [`v6.4.9`](https://togithub.com/jedib0t/go-pretty/releases/tag/v6.4.9) [Compare Source](https://togithub.com/jedib0t/go-pretty/compare/v6.4.8...v6.4.9) ### Bug-Fixes - **table** - do not merge content cells with empty ones ([#280](https://togithub.com/jedib0t/go-pretty/issues/280)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 6am on monday" in timezone Australia/Sydney, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/google/osv-scanner).

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/alecthomas/chroma/v2](https://togithub.com/alecthomas/chroma) | require | minor | `v2.9.1` -> `v2.10.0` | | [github.com/aws/aws-sdk-go](https://togithub.com/aws/aws-sdk-go) | require | patch | `v1.46.2` -> `v1.46.6` | | [github.com/bufbuild/buf](https://togithub.com/bufbuild/buf) | require | patch | `v1.27.1` -> `v1.27.2` | | [github.com/bufbuild/protovalidate-go](https://togithub.com/bufbuild/protovalidate-go) | require | patch | `v0.3.1` -> `v0.3.4` | | [github.com/cerbos/cerbos/api/genpb](https://togithub.com/cerbos/cerbos) | require | digest | `21315fe` -> `f134903` | | [github.com/cerbos/cloud-api](https://togithub.com/cerbos/cloud-api) | require | patch | `v0.1.7` -> `v0.1.8` | | [github.com/fullstorydev/grpcurl](https://togithub.com/fullstorydev/grpcurl) | require | patch | `v1.8.8` -> `v1.8.9` | | [github.com/go-git/go-git/v5](https://togithub.com/go-git/go-git) | require | minor | `v5.9.0` -> `v5.10.0` | | [github.com/google/cel-go](https://togithub.com/google/cel-go) | require | minor | `v0.17.6` -> `v0.18.1` | | [github.com/google/uuid](https://togithub.com/google/uuid) | require | minor | `v1.3.1` -> `v1.4.0` | | [github.com/rivo/tview](https://togithub.com/rivo/tview) | require | digest | `f7f32ad` -> `8b7bcf9` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>alecthomas/chroma (github.com/alecthomas/chroma/v2)</summary> ### [`v2.10.0`](https://togithub.com/alecthomas/chroma/releases/tag/v2.10.0) [Compare Source](https://togithub.com/alecthomas/chroma/compare/v2.9.1...v2.10.0) #### Changelog - [`810464a`](https://togithub.com/alecthomas/chroma/commit/810464a) Update Java lexer ([#873](https://togithub.com/alecthomas/chroma/issues/873)) - [`77e9146`](https://togithub.com/alecthomas/chroma/commit/77e9146) Add file extensions to go_template lexer ([#875](https://togithub.com/alecthomas/chroma/issues/875)) - [`b127e35`](https://togithub.com/alecthomas/chroma/commit/b127e35) Make `tty_indexed.go` respond to `None` like `tty_truecolour.go` ([#869](https://togithub.com/alecthomas/chroma/issues/869)) - [`9ae4dae`](https://togithub.com/alecthomas/chroma/commit/9ae4dae) Add `*.Dockerfile` to docker lexer ([#868](https://togithub.com/alecthomas/chroma/issues/868)) - [`2fa6f14`](https://togithub.com/alecthomas/chroma/commit/2fa6f14) Add PRQL to README ([#863](https://togithub.com/alecthomas/chroma/issues/863)) - [`17597b6`](https://togithub.com/alecthomas/chroma/commit/17597b6) Add PRQL language ([#862](https://togithub.com/alecthomas/chroma/issues/862)) - [`7eb0305`](https://togithub.com/alecthomas/chroma/commit/7eb0305) lexers/r: Match keywords prior to functions ([#860](https://togithub.com/alecthomas/chroma/issues/860)) - [`827bd93`](https://togithub.com/alecthomas/chroma/commit/827bd93) lexers: add initial version of CUE lexer ([#858](https://togithub.com/alecthomas/chroma/issues/858)) - [`9087c63`](https://togithub.com/alecthomas/chroma/commit/9087c63) docs: note about Get() being slow due to file matching - [`ccd8d68`](https://togithub.com/alecthomas/chroma/commit/ccd8d68) lexers: move to comparing bytes in tests ([#856](https://togithub.com/alecthomas/chroma/issues/856)) - [`def00e9`](https://togithub.com/alecthomas/chroma/commit/def00e9) chore: update issue templates - [`0b08639`](https://togithub.com/alecthomas/chroma/commit/0b08639) lexers: support for nim GENERALIZED_TRIPLESTR_LIT ([#853](https://togithub.com/alecthomas/chroma/issues/853)) - [`94d11ab`](https://togithub.com/alecthomas/chroma/commit/94d11ab) Update Bicep grammar with recent additions ([#850](https://togithub.com/alecthomas/chroma/issues/850)) - [`c64e1be`](https://togithub.com/alecthomas/chroma/commit/c64e1be) add justfile filename to Makefile lexer ([#852](https://togithub.com/alecthomas/chroma/issues/852)) - [`2b39461`](https://togithub.com/alecthomas/chroma/commit/2b39461) Fix GDScript3 analyse regexes ([#848](https://togithub.com/alecthomas/chroma/issues/848)) </details> <details> <summary>aws/aws-sdk-go (github.com/aws/aws-sdk-go)</summary> ### [`v1.46.6`](https://togithub.com/aws/aws-sdk-go/blob/HEAD/CHANGELOG.md#Release-v1466-2023-10-27) [Compare Source](https://togithub.com/aws/aws-sdk-go/compare/v1.46.5...v1.46.6) \=== ##### Service Client Updates - `service/elasticmapreduce`: Updates service API and documentation - Updated CreateCluster API request and DescribeCluster API responses to include EbsRootVolumeIops, and EbsRootVolumeThroughput attributes that specify the user configured root volume IOPS and throughput for Amazon EBS root device volume. This feature will be available from Amazon EMR releases 6.15.0 - `service/neptune`: Updates service API and documentation - Update TdeCredentialPassword type to SensitiveString - `service/pinpoint`: Updates service documentation - Updated documentation to describe the case insensitivity for EndpointIds. - `service/redshift`: Updates service API and documentation - added support to create a dual stack cluster - `service/wafv2`: Updates service documentation ### [`v1.46.5`](https://togithub.com/aws/aws-sdk-go/blob/HEAD/CHANGELOG.md#Release-v1465-2023-10-26) [Compare Source](https://togithub.com/aws/aws-sdk-go/compare/v1.46.4...v1.46.5) \=== ##### Service Client Updates - `service/appstream`: Updates service API and documentation - This release introduces multi-session fleets, allowing customers to provision more than one user session on a single fleet instance. - `service/ec2`: Updates service API, documentation, and paginators - Launching GetSecurityGroupsForVpc API. This API gets security groups that can be associated by the AWS account making the request with network interfaces in the specified VPC. - `service/network-firewall`: Updates service API and documentation - `service/opensearch`: Updates service API and documentation - `service/redshift`: Updates service API, documentation, and paginators - Add Redshift APIs GetResourcePolicy, DeleteResourcePolicy, PutResourcePolicy and DescribeInboundIntegrations for the new Amazon Redshift Zero-ETL integration feature, which can be used to control data ingress into Redshift namespace, and view inbound integrations. - `service/sagemaker`: Updates service API and documentation - Amazon Sagemaker Autopilot now supports Text Generation jobs. - `service/sns`: Updates service API and documentation - Message Archiving and Replay is now supported in Amazon SNS for FIFO topics. - `service/ssm-sap`: Updates service API and documentation - `service/transfer`: Updates service API, documentation, waiters, and paginators - No API changes from previous release. This release migrated the model to Smithy keeping all features unchanged. ### [`v1.46.4`](https://togithub.com/aws/aws-sdk-go/blob/HEAD/CHANGELOG.md#Release-v1464-2023-10-25) [Compare Source](https://togithub.com/aws/aws-sdk-go/compare/v1.46.3...v1.46.4) \=== ##### Service Client Updates - `service/connectcases`: Updates service API and documentation - `service/groundstation`: Updates service API and documentation - `service/iam`: Updates service API and documentation - Updates to GetAccessKeyLastUsed action to replace NoSuchEntity error with AccessDeniedException error. ### [`v1.46.3`](https://togithub.com/aws/aws-sdk-go/blob/HEAD/CHANGELOG.md#Release-v1463-2023-10-24) [Compare Source](https://togithub.com/aws/aws-sdk-go/compare/v1.46.2...v1.46.3) \=== ##### Service Client Updates - `service/codepipeline`: Updates service API and documentation - Add ability to trigger pipelines from git tags, define variables at pipeline level and new pipeline type V2. - `service/ec2`: Updates service documentation - This release updates the documentation for InstanceInterruptionBehavior and HibernationOptionsRequest to more accurately describe the behavior of these two parameters when using Spot hibernation. - `service/eks`: Updates service API - `service/iam`: Adds new service - Add the partitional endpoint for IAM in iso-f. - `service/migrationhub-config`: Updates service API and documentation - `service/migrationhubstrategy`: Updates service API, documentation, and paginators - `service/opensearchserverless`: Updates service API, documentation, and paginators </details> <details> <summary>bufbuild/buf (github.com/bufbuild/buf)</summary> ### [`v1.27.2`](https://togithub.com/bufbuild/buf/blob/HEAD/CHANGELOG.md#v1272---2023-10-27) [Compare Source](https://togithub.com/bufbuild/buf/compare/v1.27.1...v1.27.2) - Fix issue where `buf build` and other commands may fail when handling certain archives created on macOS that contain files with extended attributes. </details> <details> <summary>bufbuild/protovalidate-go (github.com/bufbuild/protovalidate-go)</summary> ### [`v0.3.4`](https://togithub.com/bufbuild/protovalidate-go/releases/tag/v0.3.4) [Compare Source](https://togithub.com/bufbuild/protovalidate-go/compare/v0.3.3...v0.3.4) #### What's Changed - Make DefaultResolver public by [@oliversun9](https://togithub.com/oliversun9) in [https://github.com/bufbuild/protovalidate-go/pull/59](https://togithub.com/bufbuild/protovalidate-go/pull/59) - Update minimum required Go version from 1.18 to 1.19 by [@nicksnyder](https://togithub.com/nicksnyder) in [https://github.com/bufbuild/protovalidate-go/pull/62](https://togithub.com/bufbuild/protovalidate-go/pull/62) - Fix ignore path for resolver.go by [@nicksnyder](https://togithub.com/nicksnyder) in [https://github.com/bufbuild/protovalidate-go/pull/63](https://togithub.com/bufbuild/protovalidate-go/pull/63) #### New Contributors - [@nicksnyder](https://togithub.com/nicksnyder) made their first contribution in [https://github.com/bufbuild/protovalidate-go/pull/62](https://togithub.com/bufbuild/protovalidate-go/pull/62) **Full Changelog**: bufbuild/protovalidate-go@v0.3.3...v0.3.4 ### [`v0.3.3`](https://togithub.com/bufbuild/protovalidate-go/releases/tag/v0.3.3) [Compare Source](https://togithub.com/bufbuild/protovalidate-go/compare/v0.3.2...v0.3.3) #### What's Changed - Update benchmarks by [@rodaine](https://togithub.com/rodaine) in [https://github.com/bufbuild/protovalidate-go/pull/50](https://togithub.com/bufbuild/protovalidate-go/pull/50) - Bug: transitive field CEL expressions fail to resolve types during type checking by [@rodaine](https://togithub.com/rodaine) in [https://github.com/bufbuild/protovalidate-go/pull/51](https://togithub.com/bufbuild/protovalidate-go/pull/51) - Fix loading field message when dependency is more than one step by [@oliversun9](https://togithub.com/oliversun9) in [https://github.com/bufbuild/protovalidate-go/pull/54](https://togithub.com/bufbuild/protovalidate-go/pull/54) - Bump github.com/google/cel-go from 0.18.0 to 0.18.1 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/bufbuild/protovalidate-go/pull/55](https://togithub.com/bufbuild/protovalidate-go/pull/55) - Make constraint resolution more flexible to different concrete extension types by [@rodaine](https://togithub.com/rodaine) in [https://github.com/bufbuild/protovalidate-go/pull/57](https://togithub.com/bufbuild/protovalidate-go/pull/57) - Move package `celext` out of internal by [@oliversun9](https://togithub.com/oliversun9) in [https://github.com/bufbuild/protovalidate-go/pull/56](https://togithub.com/bufbuild/protovalidate-go/pull/56) #### New Contributors - [@oliversun9](https://togithub.com/oliversun9) made their first contribution in [https://github.com/bufbuild/protovalidate-go/pull/54](https://togithub.com/bufbuild/protovalidate-go/pull/54) **Full Changelog**: bufbuild/protovalidate-go@v0.3.2...v0.3.3 ### [`v0.3.2`](https://togithub.com/bufbuild/protovalidate-go/releases/tag/v0.3.2) [Compare Source](https://togithub.com/bufbuild/protovalidate-go/compare/v0.3.1...v0.3.2) #### What's Changed - Build validator copy cache on write by [@emcfarlane](https://togithub.com/emcfarlane) in [https://github.com/bufbuild/protovalidate-go/pull/31](https://togithub.com/bufbuild/protovalidate-go/pull/31) - Bump github.com/google/cel-go from 0.17.4 to 0.17.6 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/bufbuild/protovalidate-go/pull/39](https://togithub.com/bufbuild/protovalidate-go/pull/39) - Bump github.com/google/cel-go from 0.17.6 to 0.18.0 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/bufbuild/protovalidate-go/pull/42](https://togithub.com/bufbuild/protovalidate-go/pull/42) - Bump buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go from 1.31.0-20230824200731-b9b8148056b9.1 to 1.31.0-20230830185350-7a34d6557349.1 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/bufbuild/protovalidate-go/pull/41](https://togithub.com/bufbuild/protovalidate-go/pull/41) - Bypass deprecation lint warning by [@akshayjshah](https://togithub.com/akshayjshah) in [https://github.com/bufbuild/protovalidate-go/pull/45](https://togithub.com/bufbuild/protovalidate-go/pull/45) - Bump actions/checkout from 3 to 4 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/bufbuild/protovalidate-go/pull/46](https://togithub.com/bufbuild/protovalidate-go/pull/46) - Cleanup: replace deprecated OptCheckStringFormat by [@rodaine](https://togithub.com/rodaine) in [https://github.com/bufbuild/protovalidate-go/pull/48](https://togithub.com/bufbuild/protovalidate-go/pull/48) - Conformance: support for multiple uniques by [@rodaine](https://togithub.com/rodaine) in [https://github.com/bufbuild/protovalidate-go/pull/49](https://togithub.com/bufbuild/protovalidate-go/pull/49) #### New Contributors - [@emcfarlane](https://togithub.com/emcfarlane) made their first contribution in [https://github.com/bufbuild/protovalidate-go/pull/31](https://togithub.com/bufbuild/protovalidate-go/pull/31) - [@akshayjshah](https://togithub.com/akshayjshah) made their first contribution in [https://github.com/bufbuild/protovalidate-go/pull/45](https://togithub.com/bufbuild/protovalidate-go/pull/45) **Full Changelog**: bufbuild/protovalidate-go@v0.3.1...v0.3.2 </details> <details> <summary>cerbos/cloud-api (github.com/cerbos/cloud-api)</summary> ### [`v0.1.8`](https://togithub.com/cerbos/cloud-api/compare/v0.1.7...v0.1.8) [Compare Source](https://togithub.com/cerbos/cloud-api/compare/v0.1.7...v0.1.8) </details> <details> <summary>fullstorydev/grpcurl (github.com/fullstorydev/grpcurl)</summary> ### [`v1.8.9`](https://togithub.com/fullstorydev/grpcurl/releases/tag/v1.8.9) [Compare Source](https://togithub.com/fullstorydev/grpcurl/compare/v1.8.8...v1.8.9) #### Changelog - [`28c0ee2`](https://togithub.com/fullstorydev/grpcurl/commit/28c0ee2) Disable CGO for improved compatibility across distros ([#420](https://togithub.com/fullstorydev/grpcurl/issues/420)) - [`bc2944d`](https://togithub.com/fullstorydev/grpcurl/commit/bc2944d) Bump golang.org/x/net from 0.9.0 to 0.17.0 ([#419](https://togithub.com/fullstorydev/grpcurl/issues/419)) - [`7a845ca`](https://togithub.com/fullstorydev/grpcurl/commit/7a845ca) SIGSEGV: panic: runtime error: invalid memory address or nil pointer dereference in protoreflect ([#416](https://togithub.com/fullstorydev/grpcurl/issues/416)) - [`c17f078`](https://togithub.com/fullstorydev/grpcurl/commit/c17f078) Added alts credential option ([#341](https://togithub.com/fullstorydev/grpcurl/issues/341)) </details> <details> <summary>go-git/go-git (github.com/go-git/go-git/v5)</summary> ### [`v5.10.0`](https://togithub.com/go-git/go-git/releases/tag/v5.10.0) [Compare Source](https://togithub.com/go-git/go-git/compare/v5.9.0...v5.10.0) #### What's Changed - PlainInitOptions.Bare and allow using InitOptions with PlainInitWithOptions by [@ThinkChaos](https://togithub.com/ThinkChaos) in [https://github.com/go-git/go-git/pull/782](https://togithub.com/go-git/go-git/pull/782) - Worktree, apply ProxyOption on Pull by [@nodivbyzero](https://togithub.com/nodivbyzero) in [https://github.com/go-git/go-git/pull/840](https://togithub.com/go-git/go-git/pull/840) - Repository: add clone --shared feature by [@enverbisevac](https://togithub.com/enverbisevac) in [https://github.com/go-git/go-git/pull/860](https://togithub.com/go-git/go-git/pull/860) - build: Add github workflow to check commit message format by [@pjbgf](https://togithub.com/pjbgf) in [https://github.com/go-git/go-git/pull/867](https://togithub.com/go-git/go-git/pull/867) - Improve handling of remote errors by [@makkes](https://togithub.com/makkes) in [https://github.com/go-git/go-git/pull/866](https://togithub.com/go-git/go-git/pull/866) - build(deps): bump golang.org/x/net from 0.15.0 to 0.17.0 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/go-git/go-git/pull/873](https://togithub.com/go-git/go-git/pull/873) - plumbing: commitgraph, Add generation v2 support by [@zeripath](https://togithub.com/zeripath) in [https://github.com/go-git/go-git/pull/869](https://togithub.com/go-git/go-git/pull/869) - plumbing: protocol/packp, Add validation for decodeLine by [@pjbgf](https://togithub.com/pjbgf) in [https://github.com/go-git/go-git/pull/868](https://togithub.com/go-git/go-git/pull/868) - plumbing: parse the encoding header of the commit object by [@liwenqiu](https://togithub.com/liwenqiu) in [https://github.com/go-git/go-git/pull/761](https://togithub.com/go-git/go-git/pull/761) - plumbing: commitgraph, allow SHA256 commit-graphs by [@zeripath](https://togithub.com/zeripath) in [https://github.com/go-git/go-git/pull/853](https://togithub.com/go-git/go-git/pull/853) - plumbing: commitgraph, Allow reading commit-graph chains by [@zeripath](https://togithub.com/zeripath) in [https://github.com/go-git/go-git/pull/854](https://togithub.com/go-git/go-git/pull/854) - plumbing/object: Support mergetag in merge commits by [@adityasaky](https://togithub.com/adityasaky) in [https://github.com/go-git/go-git/pull/847](https://togithub.com/go-git/go-git/pull/847) #### New Contributors - [@nodivbyzero](https://togithub.com/nodivbyzero) made their first contribution in [https://github.com/go-git/go-git/pull/840](https://togithub.com/go-git/go-git/pull/840) - [@adityasaky](https://togithub.com/adityasaky) made their first contribution in [https://github.com/go-git/go-git/pull/847](https://togithub.com/go-git/go-git/pull/847) - [@hezhizhen](https://togithub.com/hezhizhen) made their first contribution in [https://github.com/go-git/go-git/pull/836](https://togithub.com/go-git/go-git/pull/836) - [@0x34d](https://togithub.com/0x34d) made their first contribution in [https://github.com/go-git/go-git/pull/855](https://togithub.com/go-git/go-git/pull/855) - [@liwenqiu](https://togithub.com/liwenqiu) made their first contribution in [https://github.com/go-git/go-git/pull/761](https://togithub.com/go-git/go-git/pull/761) - [@enverbisevac](https://togithub.com/enverbisevac) made their first contribution in [https://github.com/go-git/go-git/pull/860](https://togithub.com/go-git/go-git/pull/860) - [@makkes](https://togithub.com/makkes) made their first contribution in [https://github.com/go-git/go-git/pull/866](https://togithub.com/go-git/go-git/pull/866) **Full Changelog**: go-git/go-git@v5.9.0...v5.10.0 </details> <details> <summary>google/cel-go (github.com/google/cel-go)</summary> ### [`v0.18.1`](https://togithub.com/google/cel-go/releases/tag/v0.18.1) [Compare Source](https://togithub.com/google/cel-go/compare/v0.18.0...v0.18.1) #### What's Changed - Add support for a relative offset within ast.SourceInfo by \[[#836](https://togithub.com/google/cel-go/issues/836)] - Fix last optional element to be retained as an optional index while folding \[[#841](https://togithub.com/google/cel-go/issues/841)] - Fix deprecation notice for string format validation \[[#840](https://togithub.com/google/cel-go/issues/840)] - Update cel-spec and enable wrappers conformance tests \[[#842](https://togithub.com/google/cel-go/issues/842)] - refactor: remove lexer and parser pools \[[#838](https://togithub.com/google/cel-go/issues/838)] #### New Contributors - [@TulgaCG](https://togithub.com/TulgaCG) made their first contribution in [https://github.com/google/cel-go/pull/835](https://togithub.com/google/cel-go/pull/835) - [@aimuz](https://togithub.com/aimuz) made their first contribution in [https://github.com/google/cel-go/pull/838](https://togithub.com/google/cel-go/pull/838) **Full Changelog**: google/cel-go@v0.18.0...v0.18.1 ### [`v0.18.0`](https://togithub.com/google/cel-go/releases/tag/v0.18.0) [Compare Source](https://togithub.com/google/cel-go/compare/v0.17.6...v0.18.0) #### Features The latest release of CEL introduces validators ([#775](https://togithub.com/google/cel-go/issues/775)) and optimizers ([#804](https://togithub.com/google/cel-go/issues/804), [#827](https://togithub.com/google/cel-go/issues/827)) and migrates the core CEL internals off of the protobuf expression and type representations ([#789](https://togithub.com/google/cel-go/issues/789)). - String format validator \[[#775](https://togithub.com/google/cel-go/issues/775)] - Create a Function that Reverses a String \[[#796](https://togithub.com/google/cel-go/issues/796)] - Introduce pre-order / post-order visitor pattern \[[#813](https://togithub.com/google/cel-go/issues/813)] - Add Libraries() function to Env \[[#822](https://togithub.com/google/cel-go/issues/822)] - Static optimizer for constant folding \[[#804](https://togithub.com/google/cel-go/issues/804)] - Inlining optimizer \[[#827](https://togithub.com/google/cel-go/issues/827)] - FindStructTypeFields support for types.Provider \[[#814](https://togithub.com/google/cel-go/issues/814)] #### Breaking Changes The following PR changes the API signature of the `checker.AstNode` method `Expr` to return an `ast.Expr`. - Migrate the checker.Coster to the ast.Expr \[[#798](https://togithub.com/google/cel-go/issues/798)] #### Fixes - Nil safety checks for cel.Ast \[[#784](https://togithub.com/google/cel-go/issues/784)] - Fix cost estimates to propagate result sizes \[[#787](https://togithub.com/google/cel-go/issues/787)] - Catch invalid literals created from expression factories \[[#810](https://togithub.com/google/cel-go/issues/810)] - Ensure stable ordering of overload candidates \[[#817](https://togithub.com/google/cel-go/issues/817)] - Clarify replace with/by empty string \[[#820](https://togithub.com/google/cel-go/issues/820)] - Fix functional exemptions for homogeneous literal checks \[[#832](https://togithub.com/google/cel-go/issues/832)] - Fix logical operator folding that only involve literals \[[#833](https://togithub.com/google/cel-go/issues/833)] - Upgrade go-genproto to latest \[[#831](https://togithub.com/google/cel-go/issues/831)] #### New Contributors - [@bboogler](https://togithub.com/bboogler) made their first contribution in [https://github.com/google/cel-go/pull/796](https://togithub.com/google/cel-go/pull/796) **Full Changelog**: google/cel-go@v0.17.1...v0.18.0 </details> <details> <summary>google/uuid (github.com/google/uuid)</summary> ### [`v1.4.0`](https://togithub.com/google/uuid/releases/tag/v1.4.0) [Compare Source](https://togithub.com/google/uuid/compare/v1.3.1...v1.4.0) ##### Features - UUIDs slice type with Strings() convenience method ([#133](https://togithub.com/google/uuid/issues/133)) ([cd5fbbd](https://togithub.com/google/uuid/commit/cd5fbbdd02f3e3467ac18940e07e062be1f864b4)) ##### Fixes - Clarify that Parse's job is to parse but not necessarily validate strings. (Documents current behavior) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/cerbos/cerbos).  --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Charith Ellawala <charith@cerbos.dev> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Charith Ellawala <charith@cerbos.dev>

plumbing/object: Support mergetag in merge commits

pjbgf reviewed Sep 27, 2023

View reviewed changes

plumbing/object/commit.go Outdated Show resolved Hide resolved

pjbgf added this to the v5.10.0 milestone Sep 27, 2023

adityasaky marked this pull request as ready for review September 27, 2023 19:34

pjbgf reviewed Sep 27, 2023

View reviewed changes

plumbing/object/commit.go Outdated Show resolved Hide resolved

adityasaky force-pushed the support-mergetag branch from b049a5e to cbfd0c5 Compare September 27, 2023 20:28

pjbgf approved these changes Sep 27, 2023

View reviewed changes

pjbgf merged commit 3af874d into go-git:master Sep 27, 2023

adityasaky deleted the support-mergetag branch September 27, 2023 22:29

traidare pushed a commit to traidare/go-git that referenced this pull request Oct 26, 2024

Merge pull request go-git#847 from adityasaky/support-mergetag

8381898

plumbing/object: Support mergetag in merge commits

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

plumbing/object: Support mergetag in merge commits #847

plumbing/object: Support mergetag in merge commits #847

adityasaky commented Sep 27, 2023

adityasaky commented Sep 27, 2023

pjbgf commented Sep 27, 2023

adityasaky commented Sep 27, 2023

pjbgf commented Sep 27, 2023

adityasaky commented Sep 27, 2023

pjbgf left a comment

adityasaky commented Sep 27, 2023

plumbing/object: Support mergetag in merge commits #847

plumbing/object: Support mergetag in merge commits #847

Conversation

adityasaky commented Sep 27, 2023

adityasaky commented Sep 27, 2023

pjbgf commented Sep 27, 2023

adityasaky commented Sep 27, 2023

pjbgf commented Sep 27, 2023

adityasaky commented Sep 27, 2023

pjbgf left a comment

Choose a reason for hiding this comment

adityasaky commented Sep 27, 2023