mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: factor out magic-to-name function

Browse Source 
When we have unsupported magic in a pathspec (because a command or code
path does not support particular items), we list the unsupported ones in
an error message.

Let's factor out the code here that converts the bits back into their
human-readable names, so that it can be used from other callers, which
may want to provide more flexible error messages.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2023-06-01 13:38:14 -04:00
committed by Junio C Hamano
parent 0d1bd1dfb3
commit 8e32caaa78
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pathspec.c
View File

@ -525,24 +525,29 @@ static int pathspec_item_cmp(const void *a_, const void *b_)
return strcmp(a->match, b->match);
}
static void NORETURN unsupported_magic(const char *pattern,
unsigned magic)
void pathspec_magic_names(unsigned magic, struct strbuf *out)
{
struct strbuf sb = STRBUF_INIT;
int i;
for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++) {
const struct pathspec_magic *m = pathspec_magic + i;
if (!(magic & m->bit))
continue;
if (sb.len)
strbuf_addstr(&sb, ", ");
if (out->len)
strbuf_addstr(out, ", ");
if (m->mnemonic)
strbuf_addf(&sb, _("'%s' (mnemonic: '%c')"),
strbuf_addf(out, _("'%s' (mnemonic: '%c')"),
m->name, m->mnemonic);
else
strbuf_addf(&sb, "'%s'", m->name);
strbuf_addf(out, "'%s'", m->name);
}
}
static void NORETURN unsupported_magic(const char *pattern,
unsigned magic)
{
struct strbuf sb = STRBUF_INIT;
pathspec_magic_names(magic, &sb);
/*
* We may want to substitute "this command" with a command
* name. E.g. when "git add -p" or "git add -i" dies when running