From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Feb 2017 19:25:18 +0000 (-0800)
Subject: Merge branch 'sb/unpack-trees-super-prefix'
X-Git-Tag: v2.12.0-rc0~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2243d229f75be41318db8798fc90399dd6dedb42;p=git

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
---

2243d229f75be41318db8798fc90399dd6dedb42