GH-37767: [C++][CMake] Don't touch .git/index #38003
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We run "git describe --tag --dirty" implicitly in cpp/cmake_modules/DefineOptions.cmake. If we use "--dirty", .git/index's owner may be changed. Because "git describe" touches .git/index for "--dirty". We can avoid changing .git/index's owner by not using "--dirty".
|
|
github-actions
bot
added
Component: C++
awaiting committer review
pitrou
reviewed
Oct 9, 2023
| @@ -747,7 +747,7 @@ if(NOT ARROW_GIT_ID) | |||
| OUTPUT_STRIP_TRAILING_WHITESPACE) | |||
| endif() | |||
| if(NOT ARROW_GIT_DESCRIPTION) | |||
| execute_process(COMMAND "git" "describe" "--tags" "--dirty" | |||
| execute_process(COMMAND "git" "describe" "--tags" | |||
There was a problem hiding this comment.
Are you sure this fixes the issue reliably? Is it just an implementation detail in git?
There was a problem hiding this comment.
It's an implementation detail.
The git describe document doesn't explain this behavior: https://git-scm.com/docs/git-describe
Here is the implementation with --dirty:
It touches .git/index (*_index() functions are used).
github-actions
bot
added
awaiting changes
assignUser
approved these changes
Oct 11, 2023
|
After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 277b168. There were no benchmark performance regressions. 🎉 The full Conbench report has more details. It also includes information about 1 possible false positive for unstable benchmarks that are known to sometimes produce them. |
JerAguilon
pushed a commit
to JerAguilon/arrow
that referenced
this pull request
Oct 23, 2023
### Rationale for this change We run "git describe --tag --dirty" implicitly in cpp/cmake_modules/DefineOptions.cmake. If we use "--dirty", .git/index's owner may be changed. Because "git describe" touches .git/index for "--dirty". We can avoid changing .git/index's owner by not using "--dirty". ### What changes are included in this PR? Remove "--dirty". ### Are these changes tested? Yes. I used "strace git describe ...". ### Are there any user-facing changes? No. * Closes: apache#37767 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Jacob Wujciak-Jens <[email protected]>
loicalleyne
pushed a commit
to loicalleyne/arrow
that referenced
this pull request
Nov 13, 2023
### Rationale for this change We run "git describe --tag --dirty" implicitly in cpp/cmake_modules/DefineOptions.cmake. If we use "--dirty", .git/index's owner may be changed. Because "git describe" touches .git/index for "--dirty". We can avoid changing .git/index's owner by not using "--dirty". ### What changes are included in this PR? Remove "--dirty". ### Are these changes tested? Yes. I used "strace git describe ...". ### Are there any user-facing changes? No. * Closes: apache#37767 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Jacob Wujciak-Jens <[email protected]>
dgreiss
pushed a commit
to dgreiss/arrow
that referenced
this pull request
Feb 19, 2024
### Rationale for this change We run "git describe --tag --dirty" implicitly in cpp/cmake_modules/DefineOptions.cmake. If we use "--dirty", .git/index's owner may be changed. Because "git describe" touches .git/index for "--dirty". We can avoid changing .git/index's owner by not using "--dirty". ### What changes are included in this PR? Remove "--dirty". ### Are these changes tested? Yes. I used "strace git describe ...". ### Are there any user-facing changes? No. * Closes: apache#37767 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Jacob Wujciak-Jens <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale for this change
We run "git describe --tag --dirty" implicitly in
cpp/cmake_modules/DefineOptions.cmake. If we use "--dirty", .git/index's owner may be changed. Because "git describe" touches .git/index for "--dirty".
We can avoid changing .git/index's owner by not using "--dirty".
What changes are included in this PR?
Remove "--dirty".
Are these changes tested?
Yes. I used "strace git describe ...".
Are there any user-facing changes?
No.
.gitownership #37767