Handle commit changes #20557
Merged
Handle commit changes #20557
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
Submitting the task to Taskcluster failed. DetailsInterpreterError at template.tasks[0]: object has no property pusher |
jgraham
force-pushed
the
handle_commit_changes
branch
from
d322244
to
f03203f
Compare
jgraham
force-pushed
the
handle_commit_changes
branch
2 times, most recently
from
f778850
to
1f08bdc
Compare
jgraham
force-pushed
the
handle_commit_changes
branch
2 times, most recently
from
a1d086f
to
791de03
Compare
jgraham
force-pushed
the
handle_commit_changes
branch
2 times, most recently
from
3e0c41b
to
f8e67d8
Compare
jgraham
force-pushed
the
handle_commit_changes
branch
from
f8e67d8
to
34a2086
Compare
jgraham
force-pushed
the
handle_commit_changes
branch
from
34a2086
to
0aee016
Compare
stephenmcgruer
approved these changes
Dec 5, 2019
If the decision task and the scheduled tak see different commits there are several possible scenarios: * There is a non-force push to a branch. In this case the old commit is still reachable and can be tested * There is a force push to a branch. In this case the old commit is not reachable and we want to bail asap * A PR is updated (with a force or non-force push). In this case we don't want to test the old commit. * Master is updated, thus changing the equivalent merge commit for the PR. In this case we probably want to run the tests anyway; this is only a problem if the master change also affects behaviour on the branch. Currently we bail in all these cases; instead try to treat them as descibed above.
jgraham
force-pushed
the
handle_commit_changes
branch
from
f1f5045
to
f21b906
Compare
Hexcles
added a commit
that referenced
this pull request
Dec 11, 2019
`git fetch origin expected_head:task_head` fails when we are already on `task_head` branch: "fatal: Refusing to fetch into current branch refs/heads/task_head of non-bare repository". We can't use --update-head-ok here, either, since we often want to check out an earlier commit, which is not a fast-forward. The sane way to do this is to use a separate `git reset --hard`. Also fix another unrelated AttributeError in the error messages printed when handling exceptions.
Hexcles
added a commit
that referenced
this pull request
Dec 13, 2019
`git fetch origin expected_head:task_head` fails when we are already on `task_head` branch: "fatal: Refusing to fetch into current branch refs/heads/task_head of non-bare repository". We can't use --update-head-ok here, either, since we often want to check out an earlier commit, which is not a fast-forward. The sane way to do this is to use a separate `git reset --hard`. Also fix another unrelated AttributeError in the error messages printed when handling exceptions.
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.
No description provided.