]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ua/os-version-capability'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2025 23:22:59 +0000 (15:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2025 23:23:00 +0000 (15:23 -0800)
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

1  2 
Documentation/gitprotocol-v2.adoc
builtin/bugreport.c
connect.c
t/test-lib-functions.sh
version.c

Simple merge
Simple merge
diff --cc connect.c
Simple merge
Simple merge
diff --cc version.c
index 4786c4e0a54093ca947da27f8b712bd1ea351203,8e927cf1ebc8e0c477bf615b183441a0d18ed10f..279269cc50fe727d7ccac5e6ae5bb35dc017035e
+++ 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;