fix: promotion over non-existent file #12615
Draft
+55
−2
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
yawaramin
reviewed
Oct 23, 2025
rgrinberg
reviewed
Oct 23, 2025
test/blackbox-tests/test-cases/promote/symlink-to-nonexistent.t
Outdated
Show resolved
Hide resolved
rgrinberg
reviewed
Oct 23, 2025
Alizter
force-pushed
the
push-sqrpzslmkvzl
branch
2 times, most recently
from
77a862f to
743a9ff
Compare
Alizter
force-pushed
the
push-sqrpzslmkvzl
branch
3 times, most recently
from
0d8f21f to
66f5f2d
Compare
rgrinberg
approved these changes
Nov 12, 2025
rgrinberg
requested changes
Nov 12, 2025
Member
rgrinberg
left a comment
rgrinberg
left a comment
There was a problem hiding this comment.
CI seems to be broken. Maybe you need to init a repo so that git doesn't get confused?
Alizter
force-pushed
the
push-sqrpzslmkvzl
branch
2 times, most recently
from
58bb639 to
94a1947
Compare
Member
|
Same issue. |
Signed-off-by: Ali Caglayan <[email protected]>
When we use "git diff" as the git tool, we have some logic to resolve symlinks since "git diff" doesn't handle them. This logic doesn't take into account the case where the target of a symlink doesn't exist, which happens when the file you are promoting doesn't exist yet. This can easily be fixed by taking into account this case. Signed-off-by: Ali Caglayan <[email protected]>
Alizter
force-pushed
the
push-sqrpzslmkvzl
branch
from
94a1947 to
20d2580
Compare
Collaborator
Author
|
Initialising the repo did fix it, but now we have errors as the diff programs are not able to diff non-existent files. This will increase the scope of my current fix. I guess that is a separate issue that has to be addressed first. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
The first commit reproduces the issue in #8075.
When we use "git diff" as the diff tool, we have some logic to resolve symlinks since "git diff" doesn't handle them. This logic doesn't take into account the case where the target of a symlink doesn't exist, which happens when the file you are promoting doesn't exist yet.
This can easily be fixed by taking into account this case.
TODO