undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add.c: extract new die_if_path_beyond_symlink() for reuse

Browse Source 
This will be reused by a new git check-ignore command.

Also document validate_pathspec().

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adam Spiers 2013-01-06 16:58:11 +00:00 committed by Junio C Hamano
parent 9d67b61f73
commit 512aaf9453
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/add.c
View File

@ -153,6 +153,11 @@ static void refresh(int verbose, const char **pathspec)
free(seen); free(seen);
} }
/*
* Normalizes argv relative to prefix, via get_pathspec(), and then
* runs die_if_path_beyond_symlink() on each path in the normalized
* list.
*/
static const char **validate_pathspec(const char **argv, const char *prefix) static const char **validate_pathspec(const char **argv, const char *prefix)
{ {
const char **pathspec = get_pathspec(prefix, argv); const char **pathspec = get_pathspec(prefix, argv);
@ -160,10 +165,7 @@ static const char **validate_pathspec(const char **argv, const char *prefix)
if (pathspec) { if (pathspec) {
const char **p; const char **p;
for (p = pathspec; *p; p++) { for (p = pathspec; *p; p++) {
if (has_symlink_leading_path(*p, strlen(*p))) { die_if_path_beyond_symlink(*p, prefix);
int len = prefix ? strlen(prefix) : 0;
die(_("'%s' is beyond a symbolic link"), *p + len);
}
} }
} }

12
pathspec.c
View File

@ -87,3 +87,15 @@ const char *check_path_for_gitlink(const char *path)
} }
return path; return path;
} }
/*
* Dies if the given path refers to a file inside a symlinked
* directory in the index.
*/
void die_if_path_beyond_symlink(const char *path, const char *prefix)
{
if (has_symlink_leading_path(path, strlen(path))) {
int len = prefix ? strlen(prefix) : 0;
die(_("'%s' is beyond a symbolic link"), path + len);
}
}

1
pathspec.h
View File

@ -4,5 +4,6 @@
extern char *find_pathspecs_matching_against_index(const char **pathspec); extern char *find_pathspecs_matching_against_index(const char **pathspec);
extern void add_pathspec_matches_against_index(const char **pathspec, char *seen, int specs); extern void add_pathspec_matches_against_index(const char **pathspec, char *seen, int specs);
extern const char *check_path_for_gitlink(const char *path); extern const char *check_path_for_gitlink(const char *path);
extern void die_if_path_beyond_symlink(const char *path, const char *prefix);
#endif /* PATHSPEC_H */ #endif /* PATHSPEC_H */