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

[NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-... #2413

Merged
merged 1 commit into from Oct 7, 2020

Conversation

SirIntellegence
Copy link
Contributor

…43213.netbeans.org/bugzilla/attachment.cgi?id=161749

@SirIntellegence
Copy link
Contributor Author

SirIntellegence commented Oct 1, 2020

(looking at the commit checks) That is odd... I didn't even touch that stuff. Is the current master not valid?

@matthiasblaesing
Copy link
Contributor

Because the patch falls into the "trivial" category, I think it is ok to integrate. BUT the commit message can't stand. A commit message should indicate what the change intents, if you insist on the reference, I question whether you consider the patch trivial. If the patch is not trivial, the question is: Are you the author? If not this can't be interated.

@SirIntellegence
Copy link
Contributor Author

Unfortunately not. I think it might have been @emilianbold's patch, but I am not sure. I can confirm that the changes work though. Sorry about the commit message. Do I just change the message locally and force push? I am not too familiar with git yet.

@SirIntellegence
Copy link
Contributor Author

One of the hunks did fail to apply, so I did make some changes to fix that if it is applicable.

@SirIntellegence
Copy link
Contributor Author

That commit was just changing commit text.

@SirIntellegence SirIntellegence changed the title [NETBEANS 4819] Applied patch found at https://bugzilla-attachments-2… [NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-... Oct 2, 2020
@matthiasblaesing
Copy link
Contributor

@SirIntellegence please check the comment from @lkishalmi - he's right.

@SirIntellegence
Copy link
Contributor Author

Right, sorry. Oddly enough, that was the one part of the patch that didn't just apply. Just a moment while I take care of that.

@SirIntellegence
Copy link
Contributor Author

There you go. Just a random suggestion, is it possible for you to override the default formatting settings on the projects to use spaces instead of tabs? I generally use tabs and find myself needing to use an external editor if I don't want to change that setting since tabs always get inserted.

@matthiasblaesing
Copy link
Contributor

Ok, the patch looks clean, it is simple enough to be considered trivial (parameter passing), Emilian is an apache committer, unittests come back clean. I tested a build and a timestamp was reported from jarsigner after I build with a tsaurl. So lets get this in.

@matthiasblaesing matthiasblaesing merged commit 0e88bed into apache:master Oct 7, 2020
@SirIntellegence SirIntellegence deleted the NETBEANS-4819 branch October 8, 2020 04:09
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.

None yet

3 participants