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

Will/jenkins diff cover #113

Merged
merged 1 commit into from
Jun 10, 2013
Merged

Will/jenkins diff cover #113

merged 1 commit into from
Jun 10, 2013

Conversation

wedaly
Copy link
Contributor

@wedaly wedaly commented Jun 10, 2013

This PR updates diff-cover version 0.1.1, which uses git diff origin/master...HEAD instead of git diff master...HEAD. Since the local master branch is not always current in Jenkins, this ensures that we're comparing to the most recent version of master.

Suggested reviewers: @jzoldak @cpennington

@cpennington
Copy link
Contributor

Git doesn't treat revisions differently than branches, so I'm not sure why creating a local branch would matter in this case. In particular, on my machine, git diff origin/master...HEAD with a particular revision checked out behaves the same as git diff origin/master...HEAD when the branch is checked out.

@cpennington
Copy link
Contributor

Can you actually just do a rebase and remove both eed66 and c7af1 from the history entirely? (Assuming that it works w/o them)

@wedaly
Copy link
Contributor Author

wedaly commented Jun 10, 2013

@cpennington After further experimentation, I agree with you. The change was in response to some strangeness I was seeing in Jenkins (lots of extra commits showing up in git diff origin/master...HEAD)

I want to get this merged, then watch the diff coverage HTML report to see if there are edge cases with git diff that are not being handled correctly.

to `origin/master` instead of `master`)
@cpennington
Copy link
Contributor

👍, shipit

@jzoldak
Copy link
Contributor

jzoldak commented Jun 10, 2013

👍

wedaly pushed a commit that referenced this pull request Jun 10, 2013
@wedaly wedaly merged commit 673c015 into master Jun 10, 2013
@wedaly wedaly deleted the will/jenkins-detached-head branch June 10, 2013 21:00
aboudreault pushed a commit to aboudreault/edx-platform that referenced this pull request Jul 10, 2014
…pletion-leaders

course completions leaderboard
iamjazzar pushed a commit to iamjazzar/edx-platform that referenced this pull request Nov 4, 2015
dfrojas referenced this pull request in eduNEXT/edx-platform Mar 27, 2018
Squirrel18 referenced this pull request in eduNEXT/edx-platform Jun 22, 2018
7d21ef048f528bf98958904f6bb9f5c5fc253bf3  Updated CPU and memory recommendations

25a1102a74ffb4ac3d054ed5cac76a94fdeb9c7b  Added troubleshooting section to README
pomegranited pushed a commit to edx-olive-oc/edx-platform that referenced this pull request Jul 17, 2018
prabhanshu pushed a commit to prabhanshu/edx-platform that referenced this pull request Oct 13, 2018
identical to PR openedx#113 

* Adds support for objuscating last two octets of ip address in tracking logs

* Cleaning up change

* Fixing a couple edge case events

* live oauth support (openedx#115)

* Added settings import to fix tests

* Fixes tests

* Remove vscode folder

* Fixing quality errors

* simpler obfuscation method

* cleanup2 simpler pr template (openedx#130)

* simpler pr template

* more accurate phrasing

* more specific phrasing
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.

3 participants