From f21fc76d19d5f2999882897c73ffe917d76d75c3 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 (cherry picked from commit d4524761d9e08ba5430f5a94f56648c1ef0f651c) --- deprecated.go | 7 +++++++ diff.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/deprecated.go b/deprecated.go index 1e24c10..9e38bb6 100644 --- a/deprecated.go +++ b/deprecated.go @@ -27,6 +27,13 @@ type BlobCallbackData struct { // CheckoutOpts is a deprecated alias of CheckoutOptions. type CheckoutOpts = CheckoutOptions +// 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 8b0d765..bc7f8bc 100644 --- a/diff.go +++ b/diff.go @@ -486,7 +486,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 -- 2.45.2