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

CMake: added missing HAVE_BUILTIN_AVAILABLE, HAVE_CLOCK_GETTIME_MONOTONIC #3097

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
4 participants
@dmitrykos
Contributor

dmitrykos commented Oct 4, 2018

Added missing HAVE_BUILTIN_AVAILABLE (define and test), HAVE_CLOCK_GETTIME_MONOTONIC (test). Tested with CMake on Apple OSX and Android NDK (r17b, Windows).

CMake: added missing HAVE_BUILTIN_AVAILABLE (define and test), added …
…missing test for HAVE_CLOCK_GETTIME_MONOTONIC
@dmitrykos

This comment has been minimized.

Contributor

dmitrykos commented Oct 4, 2018

@snikulov, here is new pull request.

@snikulov snikulov added the cmake label Oct 5, 2018

@snikulov snikulov self-requested a review Oct 5, 2018

@snikulov

This comment has been minimized.

Member

snikulov commented Oct 5, 2018

@bagder Daniel, can I merge this one?

@bagder

This comment has been minimized.

Member

bagder commented Oct 5, 2018

Please do, but also please amend the commit message as it doesn't really follow our style - and a "closes #3097" would be great then as well. (Ie: don't use the github merge button.)

@snikulov snikulov closed this in 667b572 Oct 5, 2018

@snikulov

This comment has been minimized.

Member

snikulov commented Oct 5, 2018

@bagder landed on master.
I use --no-ff as was suggested in command lines on GitHub and now we have the merge commit in the tree.
If it's not good please remove it with force push.

@bagder

This comment has been minimized.

Member

bagder commented Oct 5, 2018

We don't do merge commits, please rebase it properly next time.

And we don't force-push on master. Ever.

@MarcelRaad

This comment has been minimized.

Member

MarcelRaad commented Oct 5, 2018

@snikulov Do you know https://github.com/curl/curl/wiki/push-access-guidelines#how-to-work-with-a-pr-branch? That's what I'm trying to do, except that I'm doing the (You could instead use git rebase -i and choose those commits to squash or reword.)

@snikulov

This comment has been minimized.

Member

snikulov commented Oct 5, 2018

@MarcelRaad Thanks for the tip.
I've used command line help from github. The only thing which is wrong was adding --no-ff
Rebase will not show merge commit (AFAIR) because it is the same commit except special attribute.

@snikulov

This comment has been minimized.

Member

snikulov commented Oct 5, 2018

image

This one should be --ff-only by default

@bagder

This comment has been minimized.

Member

bagder commented Oct 5, 2018

(Those instructions are hard-coded by github itself, we can't change them.)

That would just make the merge fail very often. Just do it like this instead:

git checkout master
git merge [name of branch]
git rebase origin/master

... verify with git log that everything looks fine, then...

git push origin master

If there are multiple commits and you'd rather squash a few (I personally like to just 'f'ixup them), just do -i on the rebase line:

git rebase -i origin/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment