git-trash: Might as well make it work everywhere

Use $(git rev-parse HEAD) a couple of places instead of my homegrown
stuff.

a5b6653c-a031-11e3-9945-001f3b596ec9