Skip to content

diff: support bare repositories when reading gitattributes for diff algorithm

John Cai via GitGitGadget git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 12 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2diff: use HEAD for attributes when using bare repositoryDocumentation/gitattributes.txt diff.c t/lib-diff-alternative.sh +3 more+66 -57 replies
2/2diff: add --attr-source to read gitattributes from a commitDocumentation/diff-options.txt Documentation/gitattributes.txt diff.c +3 more+64 -180 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] diff: support bare repositories when reading gitattributes for diff algorithm

This patch series adds support for bare repositories for the feature added in [1]. When using a bare repository, by default we will look for gitattributes from HEAD. When the --attr-source option is passed, we will try to read gitattributes from the commit.

A side effect of this patch series is that custom drivers will now also work with bare repositories.

1. (a4cf900ee7 diff: teach diff to read algorithm from diff driver,

    2022-02-20)

John Cai (2):
diff: use HEAD for attributes when using bare repository
diff: add --attr-source to read gitattributes from a commit

 Documentation/diff-options.txt  |  4 ++++
 Documentation/gitattributes.txt |  8 +++++++
 diff.c                          | 37 ++++++++++++++++++++++++++++++---
 diff.h                          |  1 +
 t/lib-diff-alternative.sh       | 33 ++++++++++++++++++++++++-----
 t/t4018-diff-funcname.sh        | 29 ++++++++++++++++++++++++++
 userdiff.c                      |  9 +++++++-
 userdiff.h                      |  4 ++++
 8 files changed, 116 insertions(+), 9 deletions(-)

base-commit: d15644fe0226af7ffc874572d968598564a230dd
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1459%2Fjohn-cai%2Fjc%2Fdiff-attr-bare-repo-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1459/john-cai/jc/diff-attr-bare-repo-v1
Pull-Request: https://github.com/git/git/pull/1459

Signature · 1 line
gitgitgadget