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

Use Homebrew Git's hunk headers #81

Merged
merged 1 commit into from
Apr 3, 2018
Merged

Conversation

garrettr
Copy link
Contributor

@garrettr garrettr commented Apr 3, 2018

Apple's Git and Homebrew's Git sometimes disagree about hunk headers. Homebrew's Git is newer and closer to other platform's versions of Git, so we prefer it.

After installing Homebrew's Git, I ran yarn run init and yarn run update_patches (without having made any changes to the Chromium source). There is one file with a hunk header change, because I resolved a merge conflict that was created in 9f292d21 because @bbondy was using Homebrew's Git while I was using Apple's Git.

I will update the wiki to recommend developers using macOS install git from Homebrew.

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.

Test Plan:

  1. Make sure you're running a recent version of Git (e.g. 2.17.0). Don't use the version provided by Apple.
  2. yarn run init
  3. yarn run update_patches

There should be no bogus changes to the hunk headers in any of the patch files.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions

Apple's Git and Homebrew's Git sometimes disagree about hunk headers.
Homebrew's Git is newer and closer to other platform's versions of Git, so we
prefer it.
@garrettr garrettr requested a review from bbondy April 3, 2018 19:59
@bbondy bbondy merged commit 1173b3d into master Apr 3, 2018
@bsclifton bsclifton deleted the normalize-patch-context branch June 18, 2018 06:29
NejcZdovc pushed a commit that referenced this pull request Dec 10, 2018
bbondy pushed a commit that referenced this pull request Feb 18, 2019
disallow click event when stats are 0
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.

2 participants