Skip to content

Commit

Permalink
parse_pathspec: save original pathspec for reporting
Browse files Browse the repository at this point in the history
We usually use pathspec_item's match field for pathspec error
reporting. However "match" (or "raw") does not show the magic part,
which will play more important role later on. Preserve exact user
input for reporting.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nguyễn Thái Ngọc Duy authored and Junio C Hamano committed Jul 15, 2013
1 parent 87323bd commit d2ce133
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -1599,6 +1599,7 @@ int init_pathspec(struct pathspec *pathspec, const char **paths)
const char *path = paths[i];

item->match = path;
item->original = path;
item->len = strlen(path);
item->flags = 0;
if (limit_pathspec_to_literal()) {
Expand Down
2 changes: 2 additions & 0 deletions pathspec.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
else
match = prefix_path(prefix, prefixlen, copyfrom);
*raw = item->match = match;
item->original = elt;
item->len = strlen(item->match);
if (limit_pathspec_to_literal())
item->nowildcard_len = item->len;
Expand Down Expand Up @@ -277,6 +278,7 @@ void parse_pathspec(struct pathspec *pathspec,
pathspec->items = item = xmalloc(sizeof(*item));
memset(item, 0, sizeof(*item));
item->match = prefix;
item->original = prefix;
item->nowildcard_len = item->len = strlen(prefix);
raw[0] = prefix;
raw[1] = NULL;
Expand Down
1 change: 1 addition & 0 deletions pathspec.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ struct pathspec {
int max_depth;
struct pathspec_item {
const char *match;
const char *original;
unsigned magic;
int len;
int nowildcard_len;
Expand Down

0 comments on commit d2ce133

Please sign in to comment.