GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Expose diff whitespace settings by darthkurak · Pull Request #2007 · libgit2/libgit2sharp

Conversation

@darthkurak

@darthkurak darthkurak commented Jan 16, 2023

Copy link
Copy Markdown

Address #1778

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
Jakub Dropia
Expose diff whitespace settings
e0c3f31
GrimRob
GrimRob approved these changes Apr 26, 2023
View reviewed changes
amis92
amis92 reviewed Feb 28, 2024
View reviewed changes
Comment thread LibGit2Sharp/Diff.cs
Comment on lines +61 to +75
if (compareOptions.WhitespaceMode != null)
{
if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreAllWhitespaces)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE;
}
else if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreWhitespaceChange)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_CHANGE;
}
else
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_EOL;
}
}

@amis92 amis92 Feb 28, 2024

Copy link
Copy Markdown

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a thought:

Suggested change
if (compareOptions.WhitespaceMode != null)
{
if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreAllWhitespaces)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE;
}
else if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreWhitespaceChange)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_CHANGE;
}
else
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_EOL;
}
}
if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreAllWhitespaces)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE;
}
else if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreWhitespaceChange)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_CHANGE;
}
else if (compareOptions.WhitespaceMode == DiffWhitespaceMode.IgnoreWhitespaceEol)
{
options.Flags |= GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_EOL;
}

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@darthkurak

darthkurak commented Feb 28, 2024

Copy link
Copy Markdown
Author

@GrimRob can you merge this?
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@GrimRob

GrimRob commented Feb 28, 2024

Copy link
Copy Markdown

@GrimRob can you merge this?

No I don't have write access
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@starkpl

starkpl commented Mar 6, 2024

Copy link
Copy Markdown

@bording can we ask you to merge this? It would help a lot as we had to use a forked version for the last year.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@amis92

amis92 commented Mar 25, 2024

Copy link
Copy Markdown

There's also a similar PR from the original issue's OP: #1779
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@amis92 amis92 amis92 left review comments
@GrimRob GrimRob GrimRob approved these changes
Reviewers whose approvals may not affect merge requirements

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@darthkurak @GrimRob @starkpl @amis92
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.