-
Notifications
You must be signed in to change notification settings - Fork 391
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hi @gauravchl,
thanks for your contribution to our package! It looks really useful.
I'm not sure what's up with that test failure on windows, but it concerns me that it's a new test that you added. All builds need to be green before merging.
use warnings; | ||
use IPC::Open2; | ||
|
||
# An example hook script to integrate Watchman |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you help me understand more about what this shell script is doing? bash isn't my strong suit, and I don't understand how this relates to the rest of your pull request.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @annthurium, This script actually came by default when i initialized the fixture repo. https://github.com/git/git/blob/master/templates/hooks--fsmonitor-watchman.sample
Seems introduced in git 2.16 https://git-scm.com/docs/githooks/2.16.0#_fsmonitor_watchman
Should i remove this script manually? or reinitialize the fixture repo with older git version?
Update: Removed manually: 651af9c
Update 2: Removed all other templates from fixture: e516506
Hi @annthurium, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks great - thanks for addressing my review comments!
I will merge your changes this afternoon 💥
@gauravchl thanks so much for your contribution! We're preparing the next Atom release and have identified a regression that was introduced by this PR. We're going to go ahead and revert it temporarily in order to move forward with the release. And we'll be sure to get the commit template feature into the next release so that everyone can benefit from your contribution :). In the meantime, we thank you for your patience and understanding, and we'll see about sending some swag your way! And note that your commits are still in the repo history even with the revert, so you're still getting credit for the great work you did ✨ If you're curious about the regression, I've included the details below. No need for you to take action though. We've got a fix in progress, just can't get it in before the release. Repro steps:
Expected result: Commit message box shows merge message |
Description of the Change
This changes bring the support for commit template file.
It will automatically populate the commit message from template file into commit message box.
Steps to test this feature:
git config commit.template ~/.gitmessage.txt
.More details about commit template is available here.
Alternate Designs
Benefits
Users don't have to save common commit messages elsewhere and copy/paste manually.
Possible Drawbacks
N/A
Applicable Issues
#1469
Metrics
Tests
Added unit tests to verify that
git.getCommitMessageFromTemplate()
works