Skip to content

Conversation

@mhoffrog
Copy link
Contributor

@mhoffrog mhoffrog commented Mar 31, 2025

JIRA

SCM-1029

Changes

  • JGitCheckInCommand.java:
    • in case of a includes / excludes FileSet is specified then:

      • use OR condition of
        • status.getAdded().size() > 0
        • status.getChanged().size() > 0
        • status.getRemoved() > 0

      instead of status.hasUncommittedChanges()

    • log info "nothing to commit" if nothing is to be commited

Test

  • All JUnit tests passed
  • Tested in a local application

- JGitCheckInCommand.java:
  - in case of a includes / excludes FileSet
    is specified then:
    - use OR condition of
      - status.getAdded().size() > 0
      - status.getChanged().size() > 0
      - status.getRemoved() > 0
     instead of status.hasUncommittedChanges()
  - log info "nothing to commit" if nothing
    is to be commited

This closes apache#238
@slawekjaranowski
Copy link
Member

@michael-o
Merged PR should have a label and milestone ....

By default GitHub action - PR Automation do it .... but here was not executed ... probably of merge by commit no GitHub UI

@michael-o
Copy link
Member

@michael-o Merged PR should have a label and milestone ....

By default GitHub action - PR Automation do it .... but here was not executed ... probably of merge by commit no GitHub UI

I don't use the Github UI since it uses the wrong email address for me instead of the apache.org.

@slawekjaranowski
Copy link
Member

@michael-o Merged PR should have a label and milestone ....
By default GitHub action - PR Automation do it .... but here was not executed ... probably of merge by commit no GitHub UI

I don't use the Github UI since it uses the wrong email address for me instead of the apache.org.

Did you check your github configuration:
https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address#setting-your-commit-email-address-on-github

Maybe we should add or update something at:
https://maven.apache.org/developers/conventions/github.html

@michael-o
Copy link
Member

@michael-o Merged PR should have a label and milestone ....
By default GitHub action - PR Automation do it .... but here was not executed ... probably of merge by commit no GitHub UI

I don't use the Github UI since it uses the wrong email address for me instead of the apache.org.

Did you check your github configuration: https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address#setting-your-commit-email-address-on-github

I have multiple addresses for multiple purposes. The Apache isn't and won't be my primary one. Therefore, the GItHub UI is unsuitable for the task.

Maybe we should add or update something at: https://maven.apache.org/developers/conventions/github.html

Maybe, but won't solve the problem from above.

@mhoffrog
Copy link
Contributor Author

@michael-o Merged PR should have a label and milestone ....
By default GitHub action - PR Automation do it .... but here was not executed ... probably of merge by commit no GitHub UI

I don't use the Github UI since it uses the wrong email address for me instead of the apache.org.

@michael-o GitHub UI is not needed to merge. You can merge locally to the PRs target branch and then push the PR target branch - if you are authorized appropriately. Typically GitHub will recognize that merge properly and will close the PR as merged. May be the configuration behind asf-gitbox-commits is interfering with that.

@jira-importer
Copy link

Resolve #1251

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants