From d3df19f489dc92d8f32d8497f25245820e79dac5 Mon Sep 17 00:00:00 2001 From: Gustav Westling Date: Tue, 24 Aug 2021 11:47:26 +0200 Subject: [PATCH 1/5] Add DiffIgnoreWitespaceEol and deprecate DiffIgnoreWitespaceEol DiffIgnoreWitespaceEol contains a typo and does not have the same name as it's libgit2 counterpart. Fixes #773 --- diff.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/diff.go b/diff.go index e6ed284..f296d0f 100644 --- a/diff.go +++ b/diff.go @@ -487,7 +487,9 @@ 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 + // Deprecated: use DiffIgnoreWhitespaceEol instead + DiffIgnoreWitespaceEol = DiffIgnoreWhitespaceEol DiffShowUntrackedContent DiffOptionsFlag = C.GIT_DIFF_SHOW_UNTRACKED_CONTENT DiffShowUnmodified DiffOptionsFlag = C.GIT_DIFF_SHOW_UNMODIFIED -- 2.45.2 From 3f5f1acab449f3a250c34a9028d7c1c0b01a9d7a Mon Sep 17 00:00:00 2001 From: lhchavez Date: Tue, 31 Aug 2021 05:55:43 -0700 Subject: [PATCH 2/5] Update diff.go --- diff.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff.go b/diff.go index f296d0f..df889e2 100644 --- a/diff.go +++ b/diff.go @@ -489,7 +489,7 @@ const ( DiffIgnoreWhitespaceChange DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_CHANGE DiffIgnoreWhitespaceEol DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_EOL // Deprecated: use DiffIgnoreWhitespaceEol instead - DiffIgnoreWitespaceEol = DiffIgnoreWhitespaceEol + DiffIgnoreWitespaceEOL = DiffIgnoreWhitespaceEol DiffShowUntrackedContent DiffOptionsFlag = C.GIT_DIFF_SHOW_UNTRACKED_CONTENT DiffShowUnmodified DiffOptionsFlag = C.GIT_DIFF_SHOW_UNMODIFIED -- 2.45.2 From cb9d40a987deef438267d0bf6ac7893bc52b8d3b Mon Sep 17 00:00:00 2001 From: lhchavez Date: Tue, 31 Aug 2021 05:57:03 -0700 Subject: [PATCH 3/5] Update diff.go --- diff.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.go b/diff.go index df889e2..86d7fcd 100644 --- a/diff.go +++ b/diff.go @@ -487,9 +487,9 @@ const ( DiffIgnoreWhitespace DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE DiffIgnoreWhitespaceChange DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_CHANGE - DiffIgnoreWhitespaceEol DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_EOL + DiffIgnoreWhitespaceEOL DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_EOL // Deprecated: use DiffIgnoreWhitespaceEol instead - DiffIgnoreWitespaceEOL = DiffIgnoreWhitespaceEol + DiffIgnoreWitespaceEol = DiffIgnoreWhitespaceEOL DiffShowUntrackedContent DiffOptionsFlag = C.GIT_DIFF_SHOW_UNTRACKED_CONTENT DiffShowUnmodified DiffOptionsFlag = C.GIT_DIFF_SHOW_UNMODIFIED -- 2.45.2 From 64d7a8e3f43377717dbed0e2ba03bd23dcbabbb6 Mon Sep 17 00:00:00 2001 From: lhchavez Date: Tue, 31 Aug 2021 05:57:49 -0700 Subject: [PATCH 4/5] Update diff.go --- diff.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff.go b/diff.go index 86d7fcd..2713924 100644 --- a/diff.go +++ b/diff.go @@ -488,7 +488,7 @@ const ( DiffIgnoreWhitespace DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE DiffIgnoreWhitespaceChange DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_CHANGE DiffIgnoreWhitespaceEOL DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_EOL - // Deprecated: use DiffIgnoreWhitespaceEol instead + // Deprecated: use DiffIgnoreWhitespaceEOL instead DiffIgnoreWitespaceEol = DiffIgnoreWhitespaceEOL DiffShowUntrackedContent DiffOptionsFlag = C.GIT_DIFF_SHOW_UNTRACKED_CONTENT -- 2.45.2 From d9acc5f4dd877c8eea62047473ecae65aae7828d Mon Sep 17 00:00:00 2001 From: lhchavez Date: Sat, 4 Sep 2021 13:50:51 -0700 Subject: [PATCH 5/5] Moving deprecated alias to deprecated.go --- deprecated.go | 7 +++++++ diff.go | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) 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 2713924..fab4fce 100644 --- a/diff.go +++ b/diff.go @@ -488,8 +488,6 @@ const ( DiffIgnoreWhitespace DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE DiffIgnoreWhitespaceChange DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_CHANGE DiffIgnoreWhitespaceEOL DiffOptionsFlag = C.GIT_DIFF_IGNORE_WHITESPACE_EOL - // Deprecated: use DiffIgnoreWhitespaceEOL instead - DiffIgnoreWitespaceEol = DiffIgnoreWhitespaceEOL DiffShowUntrackedContent DiffOptionsFlag = C.GIT_DIFF_SHOW_UNTRACKED_CONTENT DiffShowUnmodified DiffOptionsFlag = C.GIT_DIFF_SHOW_UNMODIFIED -- 2.45.2