]> git.ipfire.org Git - thirdparty/git.git/commit - userdiff.c
attr: teach "--attr-source=<tree>" global option to "git"
authorJohn Cai <johncai86@gmail.com>
Sat, 6 May 2023 04:15:29 +0000 (04:15 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 6 May 2023 21:34:09 +0000 (14:34 -0700)
commit44451a2e5eec5360378be23e2cdbd9ecee49e14e
treee5ff5d8d9337a5c5b76440583ea4f7d9e2c63880
parent48d89b51b3bb8a60580c36731b96a7206ce1e5b9
attr: teach "--attr-source=<tree>" global option to "git"

Earlier, 47cfc9bd (attr: add flag `--source` to work with tree-ish,
2023-01-14) taught "git check-attr" the "--source=<tree>" option to
allow it to read attribute files from a tree-ish, but did so only
for the command.  Just like "check-attr" users wanted a way to use
attributes from a tree-ish and not from the working tree files,
users of other commands (like "git diff") would benefit from the
same.

Undo most of the UI change the commit made, while keeping the
internal logic to read attributes from a given tree-ish. Expose the
internal logic via a new "--attr-source=<tree>" command line option
given to "git", so that it can be used with any git command that
runs as part of the main git process.

Additionally, add an environment variable GIT_ATTR_SOURCE that is set
when --attr-source is passed in, so that subprocesses use the same value
for the attributes source tree.

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 files changed:
Documentation/git.txt
archive.c
attr.c
attr.h
builtin/check-attr.c
builtin/pack-objects.c
convert.c
environment.h
git.c
ll-merge.c
pathspec.c
t/lib-diff-alternative.sh
t/t0003-attributes.sh
t/t4018-diff-funcname.sh
userdiff.c
ws.c