Conversation
…exists sign-branch.sh added the original author as a Co-authored-by trailer with `git interpret-trailers --if-exists doNothing`. --if-exists matches on the trailer key alone, so any existing Co-authored-by (an agent's, for example) made it skip the new one and the original author was dropped from the rebuilt commit. addIfDifferent still skips an exact duplicate.
Contributor
Author
|
Folded into #44. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
sign-branch.sh adds the original author as a
Co-authored-by:trailer withgit interpret-trailers --if-exists doNothing.--if-existsmatches on the trailer key alone, so when the commit message already has anyCo-authored-by(an agent's, which is the common case for the commits this script exists to re-sign), the new trailer is skipped and the original author disappears from the rebuilt commit.Switches to
--if-exists addIfDifferent, which still skips an exact duplicate.Checked with
git interpret-trailerson a message that already carriesCo-Authored-By: Claude <…>:doNothing: only the Claude trailer remainsaddIfDifferent: Claude trailer plusCo-authored-by: Paul Warren <…>addIfDifferentwith the same trailer already present: no duplicateFound while signing rocicorp/mono#6683.