Handle one more corner case in push#994
Merged
christian-schilling merged 1 commit intomasterfrom Nov 15, 2022
Merged
Conversation
LMG
approved these changes
Oct 25, 2022
Collaborator
LMG
left a comment
LMG
left a comment
There was a problem hiding this comment.
Looks good to me but does it solve the Miri problem?
Member
Author
We don't know yet. |
Contributor
|
Nope, on Miri it still prints |
Contributor
|
For the record, this is pushing Miri commit ff0f5b39d27aaabdcd30bdb3c540583b19a05354 to Rust commit b1ab3b738ac718da74cd4aa0bb7f362d0adbdf84. |
Contributor
|
I opened an issue for the Miri trouble, to avoid spreading this across too many PRs: #998. |
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/push-corner-case
branch
3 times, most recently
from
15f65a0 to
863a6f3
Compare
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/push-corner-case
branch
9 times, most recently
from
a452eac to
67a8381
Compare
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/push-corner-case
branch
5 times, most recently
from
39cd273 to
59cac97
Compare
Change: push-corner-case
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/push-corner-case
branch
from
59cac97 to
58125bd
Compare
christian-schilling
deleted the
@changes/master/christian.schilling.de@gmail.com/push-corner-case
branch
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Nov 15, 2022
update josh instructions josh-project/josh#965 and josh-project/josh#994 have been merged so we don't need a forked josh any more. :) However, this is blocked on josh-project/josh#1032 which currently prevents me from actually testing this...
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Nov 15, 2022
update josh instructions josh-project/josh#965 and josh-project/josh#994 have been merged so we don't need a forked josh any more. :) However, this is blocked on josh-project/josh#1032 which currently prevents me from actually testing this...
RalfJung
pushed a commit
to RalfJung/rust
that referenced
this pull request
Nov 15, 2022
update josh instructions josh-project/josh#965 and josh-project/josh#994 have been merged so we don't need a forked josh any more. :) However, this is blocked on josh-project/josh#1032 which currently prevents me from actually testing this...
RalfJung
pushed a commit
to RalfJung/miri
that referenced
this pull request
Nov 17, 2022
update josh instructions josh-project/josh#965 and josh-project/josh#994 have been merged so we don't need a forked josh any more. :) However, this is blocked on josh-project/josh#1032 which currently prevents me from actually testing this...
christian-schilling
added a commit
that referenced
this pull request
Nov 21, 2022
With #994 a bug was introduced where merge commits where not handled correctly in case they include changes that are not a result of merging the two parents. Those changes would simply be discarded. Change: fix-merge-push
christian-schilling
added a commit
that referenced
this pull request
Nov 21, 2022
With #994 a bug was introduced where merge commits where not handled correctly in case they include changes that are not a result of merging the two parents. Those changes would simply be discarded. Change: fix-merge-push
LMG
pushed a commit
that referenced
this pull request
Nov 22, 2022
With #994 a bug was introduced where merge commits where not handled correctly in case they include changes that are not a result of merging the two parents. Those changes would simply be discarded. Change: fix-merge-push
christian-schilling
added a commit
that referenced
this pull request
Oct 11, 2025
Change: push-corner-case
christian-schilling
added a commit
that referenced
this pull request
Oct 11, 2025
With #994 a bug was introduced where merge commits where not handled correctly in case they include changes that are not a result of merging the two parents. Those changes would simply be discarded. Change: fix-merge-push
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
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.
No description provided.