summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-06 14:53:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-06 14:53:10 -0700
commit66c22ba6fbe0724ecce3d82611ff0ec5c2b0255f (patch)
tree8829eb1f019a57f5bdd3743d081e0751f38340c9 /contrib/subtree/git-subtree.txt
parentSync with 2.10.1 (diff)
parentget_short_sha1: make default disambiguation configurable (diff)
downloadtgif-66c22ba6fbe0724ecce3d82611ff0ec5c2b0255f.tar.xz
Merge branch 'jk/ambiguous-short-object-names'
When given an abbreviated object name that is not (or more realistically, "no longer") unique, we gave a fatal error "ambiguous argument". This error is now accompanied by hints that lists the objects that begins with the given prefix. During the course of development of this new feature, numerous minor bugs were uncovered and corrected, the most notable one of which is that we gave "short SHA1 xxxx is ambiguous." twice without good reason. * jk/ambiguous-short-object-names: get_short_sha1: make default disambiguation configurable get_short_sha1: list ambiguous objects on error for_each_abbrev: drop duplicate objects sha1_array: let callbacks interrupt iteration get_short_sha1: mark ambiguity error for translation get_short_sha1: NUL-terminate hex prefix get_short_sha1: refactor init of disambiguation code get_short_sha1: parse tags when looking for treeish get_sha1: propagate flags to child functions get_sha1: avoid repeating ourselves via ONLY_TO_DIE get_sha1: detect buggy calls with multiple disambiguators
Diffstat (limited to 'contrib/subtree/git-subtree.txt')
0 files changed, 0 insertions, 0 deletions