]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/more-git-var'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jul 2023 23:08:18 +0000 (16:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jul 2023 23:08:18 +0000 (16:08 -0700)
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

1  2 
attr.c
builtin/var.c
t/README
t/test-lib-functions.sh

diff --cc attr.c
Simple merge
diff --cc builtin/var.c
index 214999898079454affe0882be5b4e7a24a7a569b,ef45710a2053419cc49d3f2f42aea3e1c6996afa..3e3d4a6ebf278bdde60859e546bcd7381d9208d6
@@@ -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>)";
  
diff --cc t/README
Simple merge
Simple merge