Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make PromotionsExtensionPoint an optional extension #91

Merged
merged 1 commit into from
May 19, 2016

Conversation

jglick
Copy link
Member

@jglick jglick commented May 19, 2016

As per this comment. 2.26 throws big scary exceptions.

@reviewbybees esp. @daniel-beck, @oleg-nenashev

@jglick
Copy link
Member Author

jglick commented May 19, 2016

CI build is failing for unclear reason.

@oleg-nenashev oleg-nenashev merged commit d3907e6 into jenkinsci:master May 19, 2016
@jglick jglick deleted the optional branch May 19, 2016 13:56
@jglick
Copy link
Member Author

jglick commented May 19, 2016

Did you start rewriting history when merging PRs @oleg-nenashev? Irritating because

promoted-builds-plugin$ git pull && git branch -d optional
remote: Counting objects: 10, done.        
remote: Compressing objects: 100% (6/6), done.        
remote: Total 10 (delta 1), reused 1 (delta 1), pack-reused 0        
Unpacking objects: 100% (10/10), done.
From github.com:jenkinsci/promoted-builds-plugin
   3342b0c..af0cb71  master     -> origin/master
Updating 3342b0c..af0cb71
Fast-forward
 src/main/java/hudson/plugins/promoted_builds/Promotion.java                                    | 2 +-
 src/main/java/hudson/plugins/promoted_builds/integrations/jobdsl/PromotionsExtensionPoint.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
warning: deleting branch 'optional' that has been merged to
         'refs/remotes/fork/optional', but not yet merged to HEAD.
Deleted branch optional (was 2478e7c).

which means that there is no verification from Git that the full content of the branch was actually merged: for example, if I had made a follow-up commit in the branch but forgot to push it to the PR, or pushed it after your “merge”, Git will give the same warning. So it is necessary to read the hash of the branch as it stood when I locally deleted it, and then manually compare that to the last commit hash displayed in the PR prior to the merge message.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants