summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff2
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-10-03 19:47:28 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 21:03:14 -0700
commit8e3f52d77854a19cb3fd2adee40be84c8a8bdacc (patch)
treed342eca5c1880a5286108a8e12e71eee8ca2b44a /mergetools/gvimdiff2
parentabbrev: auto size the default abbreviation (diff)
downloadtgif-8e3f52d77854a19cb3fd2adee40be84c8a8bdacc.tar.xz
find_unique_abbrev: move logic out of get_short_sha1()
The get_short_sha1() is only about reading short sha1s; we do call it in a loop to check "is this long enough" for each object, but otherwise it should not need to know about things like our default_abbrev setting. So instead of asking it to set default_automatic_abbrev as a side-effect, let's just have find_unique_abbrev() pick the right place to start its loop. This requires a separate approximate_object_count() function, but that naturally belongs with the rest of sha1_file.c. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions