Skip to content

fix(scripts): keep the original author when a Co-authored-by already exists #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arv wants to merge 1 commit into from
Closed

fix(scripts): keep the original author when a Co-authored-by already exists #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/sign-branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,11 @@ while read -r sha; do
trailer=(--trailer "Co-authored-by: $(git log -1 --format='%an' "$sha") <$orig_email>")
fi
# ${arr[@]+...} so an empty array is not an unbound-variable error under bash 3.2,
# which is still what macOS ships as /bin/bash.
# which is still what macOS ships as /bin/bash. addIfDifferent, not doNothing:
# --if-exists matches on the key alone, so doNothing dropped the original author
# whenever the message already had any Co-authored-by (an agent's, say).
msg=$(git log -1 --format='%B' "$sha" \
| git interpret-trailers --if-exists doNothing ${trailer[@]+"${trailer[@]}"})
| git interpret-trailers --if-exists addIfDifferent ${trailer[@]+"${trailer[@]}"})
new=$(
export GIT_AUTHOR_NAME=$me_name GIT_AUTHOR_EMAIL=$me_email
export GIT_AUTHOR_DATE=$(git log -1 --format='%aI' "$sha")
Expand Down
Loading