Open Bug 1460587 Opened 2 years ago Updated 2 years ago

[wpt-sync] Sync PR 10948 - Avoid using diff to figure out files that changed in a revision.

Categories

(Testing :: web-platform-tests, enhancement, P4)

enhancement

Tracking

(Not tracked)

People

(Reporter: mozilla.org, Unassigned)

References

()

Details

(Whiteboard: [wptsync downstream])

Sync web-platform-tests PR 10948 into mozilla-central (this bug is closed when the sync is complete).

PR: https://github.com/w3c/web-platform-tests/pull/10948
Details from upstream follow.

James Graham <james@hoppipolla.co.uk> wrote:
>  Avoid using diff to figure out files that changed in a revision.
>  
>  In a history with a complex merge structure, trying to figure out
>  which files changed using git diff appears to be fraught with peril,
>  since it tends to show changes on both sides of the merge. With
>  e.g. PR 7579 where the branch was long-lived this ends up considering
>  most of the repository as changed and causes the command to fail. A
>  simple approach that seems to be reliable is to use git log
>  --name-only, with --first-parent to handle merges in a predicatable
>  way.
You need to log in before you can comment on or make changes to this bug.