From d4524761d9e08ba5430f5a94f56648c1ef0f651c Mon Sep 17 00:00:00 2001 From: Gustav Westling Date: Sat, 4 Sep 2021 22:54:21 +0200 Subject: [PATCH] Add DiffIgnoreWitespaceEol and deprecate DiffIgnoreWitespaceEol (#774) DiffIgnoreWitespaceEol contains a typo and does not have the same name as it's libgit2 counterpart. Fixes #773 --- deprecated.go | 7 +++++++ diff.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/deprecated.go b/deprecated.go index ae277f1..c948808 100644 --- a/deprecated.go +++ b/deprecated.go @@ -72,6 +72,13 @@ func NewCredDefault() (*Cred, error) { return NewCredentialDefault() } +// diff.go + +const ( + // Deprecated: DiffIgnoreWhitespaceEol is a deprecated alias of DiffIgnoreWhitespaceEOL. + DiffIgnoreWitespaceEol = DiffIgnoreWhitespaceEOL +) + // features.go const ( diff --git a/diff.go b/diff.go index e6ed284..fab4fce 100644 --- a/diff.go +++ b/diff.go @@ -487,7 +487,7 @@ const ( DiffIgnoreWhitespace DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE DiffIgnoreWhitespaceChange DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_CHANGE - DiffIgnoreWitespaceEol DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_EOL + DiffIgnoreWhitespaceEOL DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_EOL DiffShowUntrackedContent DiffOptionsFlag = C.GIT_DIFF_SHOW_UNTRACKED_CONTENT DiffShowUnmodified DiffOptionsFlag = C.GIT_DIFF_SHOW_UNMODIFIED