Merge branch 'jk/sh-setup-in-filter-branch' into next
commit3879f0eccd294ae2f53b5ef04fccee6bc0b7f32c
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:15:46 +0000 (25 07:15 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:15:46 +0000 (25 07:15 -0400)
tree50199fe4d0a3b8bb0fd9380fad14ee6da701492b
parentc70881dfaa6b5b539afdaebb0449193d6e167167
parent3c730fab2cae1bb52d34620af170a628b3b8c537
Merge branch 'jk/sh-setup-in-filter-branch' into next

Cleans up some duplicate ident-parsing code in the
filter-branch shell script.

Will merge to 'master' in the second batch after 1.8.0 ships.

* jk/sh-setup-in-filter-branch:
  filter-branch: use git-sh-setup's ident parsing functions
  git-sh-setup: refactor ident-parsing functions