]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/ambiguous-object-name'
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Feb 2022 23:47:33 +0000 (15:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Feb 2022 23:47:33 +0000 (15:47 -0800)
Error output given in response to an ambiguous object name has been
improved.

* ab/ambiguous-object-name:
  object-name: re-use "struct strbuf" in show_ambiguous_object()
  object-name: iterate ambiguous objects before showing header
  object-name: show date for ambiguous tag objects
  object-name: make ambiguous object output translatable
  object-name: explicitly handle bad tags in show_ambiguous_object()
  object-name: explicitly handle OBJ_BAD in show_ambiguous_object()
  object-name tests: add tests for ambiguous object blind spots

1  2 
object-name.c
t/t1512-rev-parse-disambiguation.sh

diff --cc object-name.c
Simple merge
Simple merge