Merge branch 'dd/diff-customize-index-line-abbrev'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2020 22:49:46 +0000 (15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2020 22:49:46 +0000 (15:49 -0700)
commit096c948dabc7d13a6cc81a8ad803fd96fc1c5d15
tree485338e755482416f20097587126fcaf795ec170
parent1a753720c3c416ed53e985ace9f8f1232118c516
parent3046c7f69a6337a971b219d047b8110e3f9ea971
Merge branch 'dd/diff-customize-index-line-abbrev'

The output from the "diff" family of the commands had abbreviated
object names of blobs involved in the patch, but its length was not
affected by the --abbrev option.  Now it is.

* dd/diff-customize-index-line-abbrev:
  diff: index-line: respect --abbrev in object's name
  t4013: improve diff-post-processor logic
Documentation/diff-options.txt
diff.c
t/t4013-diff-various.sh