Expose diff whitespace settings#2007

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open

darthkurak wants to merge1 commit intolibgit2:master

base:master

Choose a base branch

Open

Conversation

Copy link

Address#1778

Expose diff whitespace settings

e0c3f31

GrimRob approved these changes

amis92 reviewed

Comment on lines +61 to +75

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

Copy link

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;
	}
	elseif(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;
	}
	elseif(compareOptions.WhitespaceMode==DiffWhitespaceMode.IgnoreWhitespaceChange)
	{
	options.Flags\|=GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_CHANGE;
	}
	elseif(compareOptions.WhitespaceMode==DiffWhitespaceMode.IgnoreWhitespaceEol)
	{
	options.Flags\|=GitDiffOptionFlags.GIT_DIFF_IGNORE_WHITESPACE_EOL;
	}