From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Oct 2025 17:29:09 +0000 (-0700)
Subject: Merge branch 'ps/ci-rust'
X-Git-Tag: v2.52.0-rc0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe95c55549380c2bb52a839f127886702d7f1f4a;p=thirdparty%2Fgit.git

Merge branch 'ps/ci-rust'

CI improvements to handle the recent Rust integration better.

* ps/ci-rust:
  rust: support for Windows
  ci: verify minimum supported Rust version
  ci: check for common Rust mistakes via Clippy
  rust/varint: add safety comments
  ci: check formatting of our Rust code
  ci: deduplicate calls to `apt-get update`
---

fe95c55549380c2bb52a839f127886702d7f1f4a
diff --cc Makefile
index 1919d35bf3,366fd173e7..562e637fa0
--- a/Makefile
+++ b/Makefile
@@@ -927,13 -927,23 +927,20 @@@ export PYTHON_PAT
  TEST_SHELL_PATH = $(SHELL_PATH)
  
  LIB_FILE = libgit.a
 -XDIFF_LIB = xdiff/lib.a
 -REFTABLE_LIB = reftable/libreftable.a
+ 
  ifdef DEBUG
- RUST_LIB = target/debug/libgitcore.a
+ RUST_TARGET_DIR = target/debug
  else
- RUST_LIB = target/release/libgitcore.a
+ RUST_TARGET_DIR = target/release
+ endif
+ 
+ ifeq ($(uname_S),Windows)
+ RUST_LIB = $(RUST_TARGET_DIR)/gitcore.lib
+ else
+ RUST_LIB = $(RUST_TARGET_DIR)/libgitcore.a
  endif
  
 -# xdiff and reftable libs may in turn depend on what is in libgit.a
 -GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
 +GITLIBS = common-main.o $(LIB_FILE)
  EXTLIBS =
  
  GIT_USER_AGENT = git/$(GIT_VERSION)