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

Revert "Add an option to preserve proto names in JsonFormatter" #9506

Closed
wants to merge 1 commit into from

Conversation

jtattermusch
Copy link
Contributor

Reverts #6307

  • there is a large white-space only diff that obscures the real changes, which is really bad for maintenance. Let's reintroduce the PR without the whitespace changes so that the correct diff is shown in github UI.
  • there's been some other concerns with the PR (see comment thread on Add an option to preserve proto names in JsonFormatter #6307).

We'll be happy to accept the PR again once the concerns from the review are addressed and once the diff looks fine.

@ObsidianMinor

@jskeet
Copy link
Contributor

jskeet commented Feb 15, 2022

Hmm... creating a new commit to revert will only help fix some of the issues by merging the giant whitespace change. git annotate will still show "this was all changed in a single commit". Basically it's hard to get back to a nice diff without rewriting history at this point :(

I would suggest that we should probably:

  • Check what the actual whitespace changes are (e.g. was it LF -> CRLF, CRLF -> LF or something different?)
  • Work out what we want the whitespace to be (check other files)
  • Make other changes to JsonFormatter as desired. (I don't think it's anything semantic, just some formatting/description changes.)

@jtattermusch
Copy link
Contributor Author

Fair enough, I'll close the PR. Filed #9526 to address the CRLF inconsistencies.

Hmm... creating a new commit to revert will only help fix some of the issues by merging the giant whitespace change. git annotate will still show "this was all changed in a single commit". Basically it's hard to get back to a nice diff without rewriting history at this point :(

I would suggest that we should probably:

  • Check what the actual whitespace changes are (e.g. was it LF -> CRLF, CRLF -> LF or something different?)
  • Work out what we want the whitespace to be (check other files)
  • Make other changes to JsonFormatter as desired. (I don't think it's anything semantic, just some formatting/description changes.)

@zhangskz zhangskz deleted the revert-6307-csharp/preserve-json-names branch February 15, 2023 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants