From: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: John Cai <johncai86@gmail.com>
Subject: [PATCH 0/2] diff: support bare repositories when reading gitattributes for diff algorithm
Date: Tue, 14 Mar 2023 01:53:36 +0000 [thread overview]
Message-ID: <pull.1459.git.git.1678758818.gitgitgadget@gmail.com> (raw)
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
--
gitgitgadget
next reply other threads:[~2023-03-14 1:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 1:53 John Cai via GitGitGadget [this message]
2023-03-14 1:53 ` [PATCH 1/2] diff: use HEAD for attributes when using bare repository John Cai via GitGitGadget
2023-03-14 16:54 ` Junio C Hamano
2023-03-14 17:43 ` Junio C Hamano
2023-03-14 19:38 ` John Cai
2023-03-14 20:37 ` Junio C Hamano
2023-03-16 16:46 ` John Cai
2023-03-16 22:56 ` Junio C Hamano
2023-03-17 14:11 ` John Cai
2023-03-14 1:53 ` [PATCH 2/2] diff: add --attr-source to read gitattributes from a commit John Cai via GitGitGadget
2023-03-14 17:21 ` [PATCH 0/2] diff: support bare repositories when reading gitattributes for diff algorithm Philippe Blain
2023-03-14 19:18 ` John Cai
2023-03-14 20:44 ` Junio C Hamano
2023-03-16 14:29 ` Jeff King
2023-03-16 16:44 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1459.git.git.1678758818.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johncai86@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.