cp: allow directory merging when destination was just created#9325
Merged
cakebaker merged 2 commits intouutils:mainfrom Nov 19, 2025
Merged
cp: allow directory merging when destination was just created#9325cakebaker merged 2 commits intouutils:mainfrom
cakebaker merged 2 commits intouutils:mainfrom
Conversation
Previously, when copying to a destination that was created in the same cp call, the operation would fail with "will not overwrite just-created" for both files and directories. This change allows directories to be merged (matching GNU cp behavior) while still preventing file overwrites. The fix checks if both the source and destination are directories before allowing the merge. If either is a file, the original error behavior is preserved to prevent accidental file overwrites. Fixes the case where copying multiple directories to the same destination path would incorrectly error instead of merging their contents. fixes: uutils#9318
1092b9b to
efcdbfe
Compare
CodSpeed Performance ReportMerging #9325 will not alter performanceComparing Summary
Footnotes
|
|
GNU testsuite comparison: |
cakebaker
reviewed
Nov 19, 2025
cakebaker
reviewed
Nov 19, 2025
Contributor
cakebaker
left a comment
There was a problem hiding this comment.
The other changes look fine :)
Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Contributor
Author
|
@cakebaker Applied the suggestions, thanks! |
|
GNU testsuite comparison: |
Contributor
|
Thanks! |
naoNao89
pushed a commit
to naoNao89/coreutils
that referenced
this pull request
Nov 24, 2025
…#9325) * cp: allow directory merging when destination was just created Previously, when copying to a destination that was created in the same cp call, the operation would fail with "will not overwrite just-created" for both files and directories. This change allows directories to be merged (matching GNU cp behavior) while still preventing file overwrites. The fix checks if both the source and destination are directories before allowing the merge. If either is a file, the original error behavior is preserved to prevent accidental file overwrites. Fixes the case where copying multiple directories to the same destination path would incorrectly error instead of merging their contents. fixes: uutils#9318 * test_cp: Update with the suggestion Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com> --------- Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
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
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.
Previously, when copying to a destination that was created in the same cp call, the operation would fail with "will not overwrite just-created" for both files and directories. This change allows directories to be merged (matching GNU cp behavior) while still preventing file overwrites.
The fix checks if both the source and destination are directories before allowing the merge. If either is a file, the original error behavior is preserved to prevent accidental file overwrites.
Fixes the case where copying multiple directories to the same destination path would incorrectly error instead of merging their contents.
fixes: #9318