[v11,26/26] Revert "meson: fix conflicts with in-flight topics"

Commit Message

Patrick Steinhardt Dec. 6, 2024, 1:25 p.m. UTC

This reverts commit f5e9b17ebcc547ecfb14c542c06e30e95aa80b1a.
---
 meson.build          | 4 ----
 t/helper/meson.build | 2 --
 t/meson.build        | 2 --
 3 files changed, 8 deletions(-)

Comments

Patrick Steinhardt Dec. 6, 2024, 4:10 p.m. UTC | #1

On Fri, Dec 06, 2024 at 02:25:01PM +0100, Patrick Steinhardt wrote:
> This reverts commit f5e9b17ebcc547ecfb14c542c06e30e95aa80b1a.

Oops, this last patch shouldn't have been sent out as part of this
series. It's what I have locally and push to CI systems so that they
pass on `master`. Please drop this last patch.

Patrick

Patch

diff --git a/meson.build b/meson.build
index 442d7bbabf407aee00cce280f40a4d5527f18d9c..0dccebcdf16b07650d943e53643f0e09e2975cc9 100644
--- a/meson.build
+++ b/meson.build
@@ -235,8 +235,6 @@  libgit_sources = [
   'commit-graph.c',
   'commit-reach.c',
   'commit.c',
-  'common-exit.c',
-  'common-init.c',
   'compat/nonblock.c',
   'compat/obstack.c',
   'compat/terminal.c',
@@ -275,7 +273,6 @@  libgit_sources = [
   'ewah/ewah_rlw.c',
   'exec-cmd.c',
   'fetch-negotiator.c',
-  'fetch-object-info.c',
   'fetch-pack.c',
   'fmt-merge-msg.c',
   'fsck.c',
@@ -350,7 +347,6 @@  libgit_sources = [
   'parse-options.c',
   'patch-delta.c',
   'patch-ids.c',
-  'path-walk.c',
   'path.c',
   'pathspec.c',
   'pkt-line.c',
diff --git a/t/helper/meson.build b/t/helper/meson.build
index 1d6154ce9756db17bc9f69bc3cd71a32b93857c5..5e83884246edc7841738de5085f3255aa1fa3fbe 100644
--- a/t/helper/meson.build
+++ b/t/helper/meson.build
@@ -34,14 +34,12 @@  test_tool_sources = [
   'test-match-trees.c',
   'test-mergesort.c',
   'test-mktemp.c',
-  'test-name-hash.c',
   'test-online-cpus.c',
   'test-pack-mtimes.c',
   'test-parse-options.c',
   'test-parse-pathspec-file.c',
   'test-partial-clone.c',
   'test-path-utils.c',
-  'test-path-walk.c',
   'test-pcre2-config.c',
   'test-pkt-line.c',
   'test-proc-receive.c',
diff --git a/t/meson.build b/t/meson.build
index 1c82e27a1d48dd6a163d7b26c74b5ebf6f258d41..13fe854ba0a18f9b83dbc48651f581198042ffd3 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -177,7 +177,6 @@  integration_tests = [
   't1014-read-tree-confusing.sh',
   't1015-read-index-unmerged.sh',
   't1016-compatObjectFormat.sh',
-  't1017-cat-file-remote-object-info.sh',
   't1020-subdirectory.sh',
   't1021-rerere-in-workdir.sh',
   't1022-read-tree-partial-clone.sh',
@@ -830,7 +829,6 @@  integration_tests = [
   't6500-gc.sh',
   't6501-freshen-objects.sh',
   't6600-test-reach.sh',
-  't6601-path-walk.sh',
   't6700-tree-depth.sh',
   't7001-mv.sh',
   't7002-mv-sparse-checkout.sh',