Re: [PATCH v2 00/16] pathspec cleanup
From: Junio C Hamano <hidden>
Date: 2016-12-09 00:26:34
Will queue, but with fixes on issues spotted by my pre-acceptance mechanical filter squashed in, to fix style issues in the destination of code movements. pathspec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pathspec.c b/pathspec.c
index 08abdd3922..cabc02e79b 100644
--- a/pathspec.c
+++ b/pathspec.c@@ -68,7 +68,7 @@ static struct pathspec_magic { const char *name; } pathspec_magic[] = { { PATHSPEC_FROMTOP, '/', "top" }, - { PATHSPEC_LITERAL,'\0', "literal" }, + { PATHSPEC_LITERAL, '\0', "literal" }, { PATHSPEC_GLOB, '\0', "glob" }, { PATHSPEC_ICASE, '\0', "icase" }, { PATHSPEC_EXCLUDE, '!', "exclude" },
@@ -290,8 +290,8 @@ static void strip_submodule_slash_expensive(struct pathspec_item *item) item->len--; item->match[item->len] = '\0'; } else { - die (_("Pathspec '%s' is in submodule '%.*s'"), - item->original, ce_len, ce->name); + die(_("Pathspec '%s' is in submodule '%.*s'"), + item->original, ce_len, ce->name); } } }
@@ -364,10 +364,10 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags, } if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP) - strip_submodule_slash_cheap(item); + strip_submodule_slash_cheap(item); if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE) - strip_submodule_slash_expensive(item); + strip_submodule_slash_expensive(item); if (magic & PATHSPEC_LITERAL) { item->nowildcard_len = item->len;