From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Jul 2023 23:08:18 +0000 (-0700)
Subject: Merge branch 'bc/more-git-var'
X-Git-Tag: v2.42.0-rc0~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89d62d5e8ef42be3a73493e8ffbede589c7a31d1;p=thirdparty%2Fgit.git

Merge branch 'bc/more-git-var'

Add more "git var" for toolsmiths to learn various locations Git is
configured with either via the configuration or hardcoded defaults.

* bc/more-git-var:
  var: add config file locations
  var: add attributes files locations
  attr: expose and rename accessor functions
  var: adjust memory allocation for strings
  var: format variable structure with C99 initializers
  var: add support for listing the shell
  t: add a function to check executable bit
  var: mark unused parameters in git_var callbacks
---

89d62d5e8ef42be3a73493e8ffbede589c7a31d1
diff --cc builtin/var.c
index 2149998980,ef45710a20..3e3d4a6ebf
--- a/builtin/var.c
+++ b/builtin/var.c
@@@ -9,6 -10,6 +10,8 @@@
  #include "ident.h"
  #include "pager.h"
  #include "refs.h"
++#include "path.h"
++#include "strbuf.h"
  
  static const char var_usage[] = "git var (-l | <variable>)";