Skip to content

Adjust CMakeLists with git worktree #10298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
masaori335 merged 1 commit into from
Sep 4, 2023
Merged

Adjust CMakeLists with git worktree #10298

masaori335 merged 1 commit into from
Sep 4, 2023

Conversation

@masaori335
Copy link
Contributor

@masaori335 masaori335 commented Aug 29, 2023

In the git worktree directory, the .git is just an ASCII text file.

@masaori335 masaori335 added Build work related to build configuration or environment CMake work related to CMakes scripts or issues labels Aug 29, 2023
@masaori335 masaori335 added this to the 10.0.0 milestone Aug 29, 2023
@masaori335 masaori335 self-assigned this Aug 29, 2023
cmcfarlen
cmcfarlen previously approved these changes Aug 29, 2023
View reviewed changes
jpeach
jpeach approved these changes Sep 4, 2023
View reviewed changes
Copy link
Contributor

@jpeach jpeach left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change looks fine, but IIUC the cmake correctly, changes to the pre-commit script won't ever take effect once it is installed the first time.

@masaori335 masaori335 merged commit d50428d into apache:master Sep 4, 2023
@masaori335
Copy link
Contributor Author

masaori335 commented Sep 4, 2023

It looks like NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit is always true and the configure_file fails in the worktree directory.

-- Installing github hook
CMake Error at CMakeLists.txt:484 (configure_file):
  Not a directory

cmcfarlen pushed a commit to cmcfarlen/trafficserver that referenced this pull request Jun 3, 2024
@zwoop
Merge remote-tracking branch 'asf/master'
cdd35f9 
* asf/master: (22 commits)
  fix: check whether a protocol is enabled during the length calculation in create_npn_advertisement (apache#10381)
  Coverity 1518612: Remove dead code (apache#10384)
  prefetch_cmcd: make autests more robust by removing need for gold file wildcard (apache#10382)
  Give a chance to send a response before receiving next request on H2 (apache#9997)
  CID 1516688: Fix uninitialized member of AcceptOptions (apache#10152)
  Fix slice head request memory issue (apache#10285)
  Fixes the TSMgmt metrics APIs for new API metrics (apache#10379)
  Minor parent.config a/an change (apache#10372)
  Allow DbgCtl tag to be set after instance construction. (apache#10375)
  Fix more build dep issues, for later PRs to work (apache#10376)
  money_trace cid 1518569: string not null terminated (apache#10373)
  Fix a couple of Coverity issues in health check plugin, around filenames (apache#10371)
  Fixes some build issues that happens with  other changes (apache#10374)
  Eliminate unreachable code covered by switch default (apache#10370)
  Add tests for disk failure (apache#10192)
  Disable copying/moving for DbgCtl. (apache#10321)
  Cmake autest (apache#10327)
  cmake: add unit tests from mgmt/rpc (apache#10366)
  Adjust CMakeLists with git worktree (apache#10298)
  Fix example plugins build (apache#10326)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jpeach jpeach jpeach approved these changes

@cmcfarlen cmcfarlen cmcfarlen left review comments

Assignees

@masaori335 masaori335

Labels

Build work related to build configuration or environment CMake work related to CMakes scripts or issues

Projects

None yet

Milestone

10.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@masaori335 @jpeach @cmcfarlen