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.

Sign up for GitHub

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

Jump to bottom

Perform a weaker subtree check in Travis #11394

Merged
merged 2 commits into from
Nov 9, 2017
Merged

Perform a weaker subtree check in Travis #11394

merged 2 commits into from
Nov 9, 2017

Commits on Oct 11, 2017

  1. Improve git-subtree-check.sh 

    We have several pieces of information about subtrees:
1) What their current directory contents is
2) What their directory contents was at the time of the last subtree merge
3) What the directory contents of the upstream project is in the commit referred to by the subtree merge.

Normally, all 3 should be identical. git-subtree-check.sh so far only compared (1) with (3) however.

Fix this by comparing all three, and give some more useful diff output in the case of mismatch.

The added benefit is that (1) and (2) can be compared without needing to see the upstream repository.
    @sipa
    sipa committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    e1d0cc2 View commit details
    Browse the repository at this point in the history

  2. Check subtree consistency in Travis

    @sipa
    sipa committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    487aff4 View commit details
    Browse the repository at this point in the history