Remove *.orig files from version control #768
Merged
Conversation
This file contains hidden or 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
By git mergetool docs: > git mergetool creates *.orig backup files while resolving merges. These > are safe to remove once a file has been merged and its git mergetool > session has completed. As there were no references found to these *.orig files in the codebase, the assumption is that these files have been included accidentally by executing some variation of `git add secp256k1-sys/depend/secp256k1/*`, and they seem to not serve any use case, therefore they will be removed from version control by this commit.
By git mergetool docs: > git mergetool creates *.orig backup files while resolving merges. These > are safe to remove once a file has been merged and its git mergetool > session has completed. These files don't serve any use case in the source version control, so are going to be ignored from version control from this commit on.
|
Thanks for checking so carefully! These are part of the output of The set of files changes over time because different version of The CI failure is unrelated to your PR. I'll run my tests on this and ACK/merge it. |
|
Thanks for the thorough response. I found this by accident while rebasing a local branch, I executed |
chain-forgexcr45
added a commit
to chain-forgexcr45/rust-secp256k1
that referenced
this pull request
Sep 28, 2025
…on control 4f36b717c5e88a630d86fb51b3797e1aea73251d style: add rule to ignore *.orig files in .gitignore (nymius) aebf8bccdec4049e3533f1a818373e12a7e14f8c chore: remove *.orig files from version control (nymius) Pull request description: Looking at the changes of last update to version `6.0` of `libsecp256k1` I noticed the file extension of two new added files were `.orig`. Considering the context, I assumed these files are the result of the execution of [`git mergetool`](https://git-scm.com/docs/git-mergetool#_temporary_files), and were not intended to be included in the commit initially. Trying to understand if they served another purpose I realized a third orig file was committed with the update of `libsecp256k1` to version `4.0`, I checked for any references for these files in the codebase but didn't find any. I also checked the [libsecp256k1](https://github.com/bitcoin-core/secp256k1) to know if this was something committed in that repository but I confirm is not. To keep the source code tree clean I removed these files, and also added a new `.gitignore` rule to avoid the inclusion of these files in the future. ACKs for top commit: apoelstra: ACK 4f36b717c5e88a630d86fb51b3797e1aea73251d; successfully ran local tests Tree-SHA512: de652ec35b7bced4795b90fc1956a2d4bccdcc838c8e2d7f508d6009d0f3765e14c4cc4132f5cb8152e4cf8e7e1686aca703b2fdd6cfb4e381a1d080d4ea1a78
william2332-limf
added a commit
to william2332-limf/rust-secp256k1
that referenced
this pull request
Oct 2, 2025
…on control 4f36b717c5e88a630d86fb51b3797e1aea73251d style: add rule to ignore *.orig files in .gitignore (nymius) aebf8bccdec4049e3533f1a818373e12a7e14f8c chore: remove *.orig files from version control (nymius) Pull request description: Looking at the changes of last update to version `6.0` of `libsecp256k1` I noticed the file extension of two new added files were `.orig`. Considering the context, I assumed these files are the result of the execution of [`git mergetool`](https://git-scm.com/docs/git-mergetool#_temporary_files), and were not intended to be included in the commit initially. Trying to understand if they served another purpose I realized a third orig file was committed with the update of `libsecp256k1` to version `4.0`, I checked for any references for these files in the codebase but didn't find any. I also checked the [libsecp256k1](https://github.com/bitcoin-core/secp256k1) to know if this was something committed in that repository but I confirm is not. To keep the source code tree clean I removed these files, and also added a new `.gitignore` rule to avoid the inclusion of these files in the future. ACKs for top commit: apoelstra: ACK 4f36b717c5e88a630d86fb51b3797e1aea73251d; successfully ran local tests Tree-SHA512: de652ec35b7bced4795b90fc1956a2d4bccdcc838c8e2d7f508d6009d0f3765e14c4cc4132f5cb8152e4cf8e7e1686aca703b2fdd6cfb4e381a1d080d4ea1a78
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Looking at the changes of last update to version
6.0oflibsecp256k1I noticed the file extension of two new added files were.orig.Considering the context, I assumed these files are the result of the execution of
git mergetool, and were not intended to be included in the commit initially.Trying to understand if they served another purpose I realized a third orig file was committed with the update of
libsecp256k1to version4.0,I checked for any references for these files in the codebase but didn't find any.
I also checked the libsecp256k1 to know if this was something committed in that repository but I confirm is not.
To keep the source code tree clean I removed these files, and also added a new
.gitignorerule to avoid the inclusion of these files in the future.