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

Don't die on diffing file deletions (again) #1028

Merged
merged 1 commit into from
Jul 24, 2017

Conversation

dbushong
Copy link
Contributor

@dbushong dbushong commented Jul 3, 2017

Makes null content (file deletion):

  1. not identify as binary (so default diff style is nicer)
  2. not break binary diff if it is

Addresses regression(?) of #950

Makes `null` content (file deletion):

1. not identify as binary (so default diff style is nicer)
2. not break binary diff if it is

Addresses regression(?) of yeoman#950
@dbushong
Copy link
Contributor Author

dbushong commented Jul 5, 2017

CI fail doesn't look related to my changes

@SBoudrias
Copy link
Member

Thanks, I'll take review the code this weekend.

@SBoudrias SBoudrias self-requested a review July 6, 2017 01:57
@SBoudrias
Copy link
Member

Hey, not sure what happened, but there's no indentation in the files you edited? Mind fixing that?

@dbushong
Copy link
Contributor Author

Huh. Could you be more specific? The diff on Github LGTM, and git show | cat -vet LGTM

  • which line of which file do you see a problem on
  • how many spaces do you see (are they tabs or spaces?)
  • how are you viewing it

@SBoudrias
Copy link
Member

Looking fine today, must've been a Github bug the other day...

@SBoudrias SBoudrias merged commit f8e46b0 into yeoman:master Jul 24, 2017
@SBoudrias
Copy link
Member

Thanks!

@dbushong dbushong deleted the fix-is-binary branch July 24, 2017 16:40
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.

None yet

2 participants