From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 May 2023 17:11:41 +0000 (-0700)
Subject: Merge branch 'jc/attr-source-tree'
X-Git-Tag: v2.41.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67a3b2b39f638872531324e03217fa58f7b9ad1e;p=thirdparty%2Fgit.git

Merge branch 'jc/attr-source-tree'

"git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.

* jc/attr-source-tree:
  attr: teach "--attr-source=<tree>" global option to "git"
---

67a3b2b39f638872531324e03217fa58f7b9ad1e
diff --cc attr.c
index ddf2b0cbc2,11238d6083..d45d34058d
--- a/attr.c
+++ b/attr.c
@@@ -20,7 -20,7 +20,8 @@@
  #include "object-store.h"
  #include "setup.h"
  #include "thread-utils.h"
 +#include "tree-walk.h"
+ #include "object-name.h"
  
  const char git_attr__true[] = "(builtin)true";
  const char git_attr__false[] = "\0(builtin)false";