How to prevent empty git commit --amend

Hello,

I sometimes get a bit distracted when making amends. Once or twice per week I do a commit, then realize I added something I shouldn't, or forgot to add a line here or there, and then I do a git commit --amend to fix it.

The thing is, a lot of times I forget to stage the modifications I did. And here is my issue: *git commit* refuses to work when there's nothing to commit, but *git commit --amend* happily pops up the editor and says you have committed something when you did not add/change anything.

Is there a way to prevent a *git commit --amend** with nothing to commit from working? If not, I would like to suggest that this feature would be very helpful :)

Thanks for your time! Ivo Anjo