Skip to content
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.

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

Addon: Squash Git commits - ignores custom commit messages #5337

Closed
spacecowboy opened this issue Feb 4, 2021 · 2 comments
Closed

Addon: Squash Git commits - ignores custom commit messages #5337

spacecowboy opened this issue Feb 4, 2021 · 2 comments
Assignees
Labels
bug Something is broken.
Milestone

Comments

@spacecowboy
Copy link

Describe the issue

When enabling git squashing per author, the squashed commit's title is the default weblate commit message. Full commit is as follows:

Translated using Weblate (Russian)

Currently translated at 2.7% (2 of 73 strings)

Updated Russian translation using Weblate

Currently translated at 95.9% (94 of 98 strings)
Co-authored-by: Nikita Epifanov's avatarNikita Epifanov <nikgreens@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/feeder/android-strings/ru/
Translate-URL: https://hosted.weblate.org/projects/feeder/fastlane/ru/
Translation: Feeder/Android strings
Translation: Feeder/F-Droid and Play Store metadata

Note that the title of the commit is

Translated using Weblate (Russian)

Where as the title of the squashed commit inside the body uses the template that I have configured:

Updated Russian translation using Weblate

I already tried

Describe the steps you tried to solve the problem yourself.

  • I've looked in the settings and the Squash Git Commits addon suggests that the commits should simply be squashed
  • The addon has a commit message box you can fill in - but it is not at all clear if this message supports template variables.

To Reproduce the issue

Steps to reproduce the behavior:

  1. Enable the Squash Git Commits addon
  2. Enable per-author
  3. Enable append trailers to squashed commits
  4. Set a custom commit message for Commit message when translating in the project
  5. See incorrect title of squashed commit

Expected behavior

The commit message should look like this (note first row difference):

Updated Russian translation using Weblate

Currently translated at 2.7% (2 of 73 strings)

Updated Russian translation using Weblate

Currently translated at 95.9% (94 of 98 strings)
Co-authored-by: Nikita Epifanov's avatarNikita Epifanov <nikgreens@protonmail.com>
Translate-URL: https://hosted.weblate.org/projects/feeder/android-strings/ru/
Translate-URL: https://hosted.weblate.org/projects/feeder/fastlane/ru/
Translation: Feeder/Android strings
Translation: Feeder/F-Droid and Play Store metadata
@nijel nijel added the bug Something is broken. label Feb 4, 2021
@nijel nijel added this to the 4.5 milestone Feb 4, 2021
@nijel
Copy link
Member

nijel commented Feb 4, 2021

Looking at the code it is indeed ignored with "Append trailers to squashed commit message" turned on.

@nijel nijel self-assigned this Feb 4, 2021
@nijel nijel closed this as completed in 0043fa3 Feb 4, 2021
@github-actions
Copy link

github-actions bot commented Feb 4, 2021

Thank you for your report, the issue you have reported has just been fixed.

  • In case you see a problem with the fix, please comment on this issue.
  • In case you see a similar problem, please open a separate issue.
  • If you are happy with the outcome, don’t hesitate to support Weblate by making a donation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is broken.
Projects
None yet
Development

No branches or pull requests

2 participants