From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Feb 2025 23:22:59 +0000 (-0800)
Subject: Merge branch 'ua/os-version-capability'
X-Git-Tag: v2.49.0-rc1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d8cce051add2eb82cb0be97a58201c1d3fe0c1b;p=thirdparty%2Fgit.git

Merge branch 'ua/os-version-capability'

The value of "uname -s" is by default sent over the wire as a part
of the "version" capability.

* ua/os-version-capability:
  agent: advertise OS name via agent capability
  t5701: add setup test to remove side-effect dependency
  version: extend get_uname_info() to hide system details
  version: refactor get_uname_info()
  version: refactor redact_non_printables()
  version: replace manual ASCII checks with isprint() for clarity
---

9d8cce051add2eb82cb0be97a58201c1d3fe0c1b
diff --cc version.c
index 4786c4e0a5,8e927cf1eb..279269cc50
--- a/version.c
+++ b/version.c
@@@ -1,13 -1,11 +1,16 @@@
+ #define USE_THE_REPOSITORY_VARIABLE
+ 
  #include "git-compat-util.h"
  #include "version.h"
 -#include "version-def.h"
  #include "strbuf.h"
+ #include "gettext.h"
  
 +#ifndef GIT_VERSION_H
 +# include "version-def.h"
 +#else
 +# include GIT_VERSION_H
 +#endif
 +
  const char git_version_string[] = GIT_VERSION;
  const char git_built_from_commit_string[] = GIT_BUILT_FROM_COMMIT;