From: Seija Kijin <doremylover123@gmail.com>
This check is designed to die if global_magic has the PATHSPEC_LITERAL and any other setting.
This can be written is a much more obvious way: if global_magic has PATHSPEC_LITERAL, it can only BE PATHSPEC_LITERAL, and if it isn't then there are other settings.
Signed-off-by: Seija Kijin <doremylover123@gmail.com>
---
pathsec: make check for PATHSPEC_LITERAL more readable
This check is designed to die if global_magic has the PATHSPEC_LITERAL
and any other setting.
This can be written is a much more obvious way: if global_magic has
PATHSPEC_LITERAL, it can only BE PATHSPEC_LITERAL, and if it isn't then
there are other settings.Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1453%2FAreaZR%2Fredundant-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1453/AreaZR/redundant-v1 Pull-Request: https://github.com/git/git/pull/1453
pathspec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to pathspec.c +1 −1
diff --git a/pathspec.c b/pathspec.c index 0fc6f84a6e6..0af953d055d 100644 --- a/pathspec.c +++ b/pathspec.c @@ -313,7 +313,7 @@ static int get_global_magic(int element_magic) global_magic |= PATHSPEC_ICASE; if ((global_magic & PATHSPEC_LITERAL) && - (global_magic & ~PATHSPEC_LITERAL)) + (global_magic != PATHSPEC_LITERAL)) die(_("global 'literal' pathspec setting is incompatible " "with all other global pathspec settings")); base-commit: d882f382b3d939d90cfa58d17b17802338f05d66
-- gitgitgadget