Merge branch 'sb/unpack-trees-super-prefix'
commit2243d229f75be41318db8798fc90399dd6dedb42
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Feb 2017 19:25:18 +0000 (3 11:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Feb 2017 19:25:18 +0000 (3 11:25 -0800)
tree6276ce793c1e7a0820b9131291f7c1882f5d88c2
parent8a8f121049fdd881981799755a041b3f81449805
parent3d415425c7b6ca0d2243a4589672369e7a02fc2c
Merge branch 'sb/unpack-trees-super-prefix'

"git read-tree" and its underlying unpack_trees() machinery learned
to report problematic paths prefixed with the --super-prefix option.

* sb/unpack-trees-super-prefix:
  unpack-trees: support super-prefix option
  t1001: modernize style
  t1000: modernize style
  read-tree: use OPT_BOOL instead of OPT_SET_INT
git.c
unpack-trees.c