[v10,23/23] meson: fix conflicts with in-flight topics

Commit Message

Patrick Steinhardt Nov. 28, 2024, 4:12 p.m. UTC

As support for Meson is still in-flight we have to accommodate for
conflicts with topics in "seen". The following conflicts are being
addressed in this commit:

  - ej/cat-file-remote-object-info adds t1017 and "fetch-object-info.c".

  - ds/path-walk-1 adds t6601 as well as "path-walk.c" and
    "test-path-walk.c".

  - ps/reftable-detach adds "reftable/system.c".

  - js/libgit-rust adds "common-exit.c" and "common-init.c".

  - ds/full-name-hash adds "t/helper/test-name-hash.c".

  - cw/worktree-extension deletes t2408.

This is somewhat painful in the current state where Meson is not yet
part of the main tree, but we'll have to live with that for the time
being.

I've split this commit out into a separate fixup-style commit such that
it is possible to test this topic both with and without "seen" merged
into it. You can simply revert this commit to test without "seen".

Signed-off-by: Patrick Steinhardt <[e-mail]>
---
 meson.build                 | 7 ++++++-
 t/helper/meson.build        | 2 ++
 t/meson.build               | 3 ++-
 templates/hooks/meson.build | 2 +-
 templates/info/meson.build  | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

Patch

diff --git a/meson.build b/meson.build
index 6531c9b67ed2cb8cb5eac9b0be4654ddd14fbe1d..055c0671e9bc834062aff99e1e4e3ea3e54ad088 100644
--- a/meson.build
+++ b/meson.build
@@ -238,6 +238,8 @@  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',
@@ -276,6 +278,7 @@  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,6 +353,7 @@  libgit_sources = [
   'parse-options.c',
   'patch-delta.c',
   'patch-ids.c',
+  'path-walk.c',
   'path.c',
   'pathspec.c',
   'pkt-line.c',
@@ -390,6 +394,7 @@  libgit_sources = [
   'reftable/reader.c',
   'reftable/record.c',
   'reftable/stack.c',
+  'reftable/system.c',
   'reftable/tree.c',
   'reftable/writer.c',
   'remote.c',
@@ -1694,7 +1699,7 @@  foreach alias : [ 'git-receive-pack', 'git-upload-archive', 'git-upload-pack' ]
 
   install_symlink(alias + executable_suffix,
     install_dir: get_option('libexecdir') / 'git-core',
-    pointing_to: 'git-remote-http',
+    pointing_to: 'git',
   )
 endforeach
 
diff --git a/t/helper/meson.build b/t/helper/meson.build
index 5e83884246edc7841738de5085f3255aa1fa3fbe..1d6154ce9756db17bc9f69bc3cd71a32b93857c5 100644
--- a/t/helper/meson.build
+++ b/t/helper/meson.build
@@ -34,12 +34,14 @@  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 86076b77d2005529f58fb402e86bc95048071342..1c82e27a1d48dd6a163d7b26c74b5ebf6f258d41 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -177,6 +177,7 @@  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',
@@ -306,7 +307,6 @@  integration_tests = [
   't2405-worktree-submodule.sh',
   't2406-worktree-repair.sh',
   't2407-worktree-heads.sh',
-  't2408-worktree-relative.sh',
   't2500-untracked-overwriting.sh',
   't2501-cwd-empty.sh',
   't3000-ls-files-others.sh',
@@ -830,6 +830,7 @@  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',
diff --git a/templates/hooks/meson.build b/templates/hooks/meson.build
index 5bbb1bd483f24e05f826918fe63391ef72334e11..ef85e10a16ccd6c5569b8fc25210d6481025f33f 100644
--- a/templates/hooks/meson.build
+++ b/templates/hooks/meson.build
@@ -21,6 +21,6 @@  foreach hook : hooks
     output: hook,
     configuration: template_config,
     install: true,
-    install_dir: get_option('datadir') / 'git-core/templates',
+    install_dir: get_option('datadir') / 'git-core/templates/hooks',
   )
 endforeach
diff --git a/templates/info/meson.build b/templates/info/meson.build
index 7af5ddd24985fc0a5888961939ae3b2758f2aaa8..026f2313858c24e30a9bf115ee0f58144a593729 100644
--- a/templates/info/meson.build
+++ b/templates/info/meson.build
@@ -3,5 +3,5 @@  configure_file(
   output: 'exclude',
   configuration: template_config,
   install: true,
-  install_dir: get_option('datadir') / 'git-core/templates',
+  install_dir: get_option('datadir') / 'git-core/templates/info',
 )