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

Fix `git diff` command in CI script #2672

Merged
merged 1 commit into from Aug 1, 2014

Conversation

Projects
None yet
4 participants
@alfredxing
Member

alfredxing commented Aug 1, 2014

Addresses #2615 (comment).

Found this neat command that seems to work: git diff --name-only ..master. It shows all files changed in that pull request only (similar to the "Files Changed" tab on GitHub). I tested this on a few open PR's in this repo.

If it works well in script/proof we can consider using it in script/test as well.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Aug 1, 2014

Member

Can you modify a site file in this PR then revert that change and squash? That interim commit should trigger the proof if all is well.

Member

parkr commented Aug 1, 2014

Can you modify a site file in this PR then revert that change and squash? That interim commit should trigger the proof if all is well.

@ivantsepp

This comment has been minimized.

Show comment
Hide comment
@ivantsepp

ivantsepp Aug 1, 2014

Contributor

I'm not sure if that works? I tried it with #2007.

I've always used git diff --name-only $(git merge-base master HEAD) to mimic the "Files Changed" tab on Github.

Edit: Actually git diff --name-only master... seems to work as well

Contributor

ivantsepp commented Aug 1, 2014

I'm not sure if that works? I tried it with #2007.

I've always used git diff --name-only $(git merge-base master HEAD) to mimic the "Files Changed" tab on Github.

Edit: Actually git diff --name-only master... seems to work as well

@alfredxing

This comment has been minimized.

Show comment
Hide comment
@alfredxing

alfredxing Aug 1, 2014

Member

Worked as expected: https://travis-ci.org/jekyll/jekyll/jobs/31436061#L126 (commit above disappeared due to squash).

Member

alfredxing commented Aug 1, 2014

Worked as expected: https://travis-ci.org/jekyll/jekyll/jobs/31436061#L126 (commit above disappeared due to squash).

@parkr parkr merged commit d8bb7f7 into jekyll:master Aug 1, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

parkr added a commit that referenced this pull request Aug 1, 2014

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.