Skip to content

Change commit message and PR title to imperative mood#6177

Merged
andrross merged 1 commit intoopensearch-project:mainfrom
andrross:imperative-commit
Feb 3, 2023
Merged

Change commit message and PR title to imperative mood#6177
andrross merged 1 commit intoopensearch-project:mainfrom
andrross:imperative-commit

Conversation

@andrross
Copy link
Copy Markdown
Member

@andrross andrross commented Feb 3, 2023

Because I'm a pedant.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Andrew Ross <andrross@amazon.com>
Copy link
Copy Markdown
Member

@saratvemulapalli saratvemulapalli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Glad you did this on a Friday 😃

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 3, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 3, 2023

Gradle Check (Jenkins) Run Completed with:

@andrross andrross merged commit 61304a6 into opensearch-project:main Feb 3, 2023
@andrross andrross deleted the imperative-commit branch February 3, 2023 22:44
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-6177-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 61304a6a31cc2a0f722a867f515e5cb68d9050d6
# Push it to GitHub
git push --set-upstream origin backport/backport-6177-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-6177-to-2.x.

andrross added a commit to andrross/OpenSearch that referenced this pull request Feb 3, 2023
This backports both opensearch-project#2572 and opensearch-project#6177. This was created by doing:

```
git checkout upstream/main .github/workflows/version.yml
```

Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross mentioned this pull request Feb 3, 2023
6 tasks
andrross added a commit that referenced this pull request Feb 4, 2023
This backports both #2572 and #6177. This was created by doing:

```
git checkout upstream/main .github/workflows/version.yml
```

Signed-off-by: Andrew Ross <andrross@amazon.com>
@dblock
Copy link
Copy Markdown
Member

dblock commented Feb 8, 2023

Is it "Increment" or "Increments"?

@andrross
Copy link
Copy Markdown
Member Author

andrross commented Feb 8, 2023

Is it "Increment" or "Increments"?

"Increment", per the guidance here: https://cbea.ms/git-commit/

The way I remember this is by referring to how git itself formulates messages for things like git revert:

Revert "Andrew's idea that seemed great at the time"

This reverts commit abcd1234

@dblock
Copy link
Copy Markdown
Member

dblock commented Feb 9, 2023

@andrross I think I am thrown off by dependapot which keeps saying "bumps". We should fix it probably.

@andrross
Copy link
Copy Markdown
Member Author

andrross commented Feb 9, 2023

@dblock dangoslen/dependabot-changelog-helper#131

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

Labels

backport 2.x Backport to 2.x branch skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants