Skip to content

Include changes in last commit when running pre-commit hooks after git commit --amend #167

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

Jump to bottom
Closed
wants to merge 18 commits into from
Closed

Include changes in last commit when running pre-commit hooks after git commit --amend #167

wants to merge 18 commits into from

Conversation

@jawshooah
Copy link
Collaborator

@jawshooah jawshooah commented Apr 8, 2015

Closes #146

jawshooah added 11 commits April 7, 2015 20:50
@jawshooah
Add method Utils.parent_command
d8c3ff8 
Returns the name of the command corresponding to the parent of
the current process, which will be the calling git command when
running hooks.
@jawshooah
Add spec for Utils.parent_command
f30dd0c
@jawshooah
Add helper method HookContext::PreCommit#amend?
b42eac4 
Returns true if the current hook run was initiated by amending
a commit, false otherwise.
@jawshooah
Add specs for HookContext::PreCommit#amend?
fdb1230
@jawshooah
Use Utils.parent_command, not last_command
21b2321
@jawshooah
Disable ClassLength warning for HookContext::PreCommit
55d41cf
@jawshooah
Move HookContext::PreCommit#amend? to top of class
4796111
@jawshooah
Cache HookContext::PreCommit#amend? value
005d67a
@jawshooah
Include modifications from last commit if amending
30f4576
@jawshooah
Test #modified_files when amending last commit
3eec82f
@jawshooah
Add specs for HookContext::PreCommit#modified_lines_in_file
b367eac
sds
sds reviewed Apr 8, 2015
View reviewed changes
lib/overcommit/hook_context/pre_commit.rb Outdated
Copy link
Owner

@sds sds Apr 8, 2015

Choose a reason for hiding this comment

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

While right now there are no other git commands that have an --amend flag or a flag with --amend* as a prefix (that I know of), for the sake of future proofing we should constrain this regex to prevent false positives:

/\scommit\s.*\s--amend(\s|$)/

You can also do an early return here since at this point you know this was an amend, saving a shell invocation below. (admittedly a micro-optimization)

return @amended if @amended = !(/--amend/ =~ cmd).nil?

@jawshooah
Copy link
Collaborator Author

jawshooah commented Apr 8, 2015

@sds Definitely let me know if you think #amendment? could be implemented more elegantly. It's kind of a mess at the moment, but with the comments I think it's fairly straightforward.

@sds sds added the enhancement label Apr 8, 2015
@sds
Copy link
Owner

sds commented Apr 8, 2015

Thanks for addressing those comments, @jawshooah. This is great!

Merged in 7f23eb4.

@sds sds closed this Apr 8, 2015
@sds sds mentioned this pull request Apr 8, 2015
Closed
@jawshooah jawshooah deleted the pre-commit/check-amend branch April 8, 2015 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Detect git commit --amend in pre-commit hooks so staged files include everything in commit

2 participants

@jawshooah @sds