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

git add -u: die on unmatched pathspec

Browse Source 
If a pathspec is supplied to 'git add -u' and no path matches
the pattern, fail with an approriate error message and exit code.

Tested-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-02-09 17:30:49 -05:00
parent 78d553b7d7
commit 81f45e7dc4
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builtin-add.c
View File

@ -41,7 +41,19 @@ static void fill_pathspec_matches(const char **pathspec, char *seen, int specs)
} }
} }
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix) static char *find_used_pathspec(const char **pathspec)
{
char *seen;
int i;
for (i = 0; pathspec[i]; i++)
; /* just counting */
seen = xcalloc(i, 1);
fill_pathspec_matches(pathspec, seen, i);
return seen;
}
static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
{ {
char *seen; char *seen;
int i, specs; int i, specs;
@ -61,13 +73,7 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
} }
dir->nr = dst - dir->entries; dir->nr = dst - dir->entries;
fill_pathspec_matches(pathspec, seen, specs); fill_pathspec_matches(pathspec, seen, specs);
return seen;
for (i = 0; i < specs; i++) {
if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i]))
die("pathspec '%s' did not match any files",
pathspec[i]);
}
free(seen);
} }
static void treat_gitlinks(const char **pathspec) static void treat_gitlinks(const char **pathspec)
@ -283,6 +289,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
int flags; int flags;
int add_new_files; int add_new_files;
int require_pathspec; int require_pathspec;
char *seen = NULL;
git_config(add_config, NULL); git_config(add_config, NULL);
@ -342,7 +349,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
/* This picks up the paths that are not tracked */ /* This picks up the paths that are not tracked */
baselen = fill_directory(&dir, pathspec); baselen = fill_directory(&dir, pathspec);
if (pathspec) if (pathspec)
prune_directory(&dir, pathspec, baselen); seen = prune_directory(&dir, pathspec, baselen);
} }
if (refresh_only) { if (refresh_only) {
@ -350,6 +357,19 @@ int cmd_add(int argc, const char **argv, const char *prefix)
goto finish; goto finish;
} }
if (pathspec) {
int i;
if (!seen)
seen = find_used_pathspec(pathspec);
for (i = 0; pathspec[i]; i++) {
if (!seen[i] && pathspec[i][0]
&& !file_exists(pathspec[i]))
die("pathspec '%s' did not match any files",
pathspec[i]);
}
free(seen);
}
exit_status |= add_files_to_cache(prefix, pathspec, flags); exit_status |= add_files_to_cache(prefix, pathspec, flags);
if (add_new_files) if (add_new_files)