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

Fix per-directory exclude handing for "git add"

Browse Source 
In "dir_struct", each exclusion element in the exclusion stack records a
base string (pointer to the beginning with length) so that we can tell
where it came from, but this pointer is just pointing at the parameter
that is given by the caller to the push_exclude_per_directory()
function.

While read_directory_recursive() runs, calls to excluded() makes use
the data in the exclusion elements, including this base string.  The
caller of read_directory_recursive() is not supposed to free the
buffer it gave to push_exclude_per_directory() earlier, until it
returns.

The test case Bruce Stephens gave in the mailing list discussion
was simplified and added to the t3700 test.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-11-16 01:15:41 -08:00
parent c1a95fa629
commit 41a7aa588f
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dir.c
View File

@ -654,6 +654,7 @@ static void free_simplify(struct path_simplify *simplify)
int read_directory(struct dir_struct *dir, const char *path, const char *base, int baselen, const char **pathspec) int read_directory(struct dir_struct *dir, const char *path, const char *base, int baselen, const char **pathspec)
{ {
struct path_simplify *simplify = create_simplify(pathspec); struct path_simplify *simplify = create_simplify(pathspec);
char *pp = NULL;
/* /*
* Make sure to do the per-directory exclude for all the * Make sure to do the per-directory exclude for all the
@ -661,7 +662,8 @@ int read_directory(struct dir_struct *dir, const char *path, const char *base, i
*/ */
if (baselen) { if (baselen) {
if (dir->exclude_per_dir) { if (dir->exclude_per_dir) {
char *p, *pp = xmalloc(baselen+1); char *p;
pp = xmalloc(baselen+1);
memcpy(pp, base, baselen+1); memcpy(pp, base, baselen+1);
p = pp; p = pp;
while (1) { while (1) {
@ -677,12 +679,12 @@ int read_directory(struct dir_struct *dir, const char *path, const char *base, i
else else
p = pp + baselen; p = pp + baselen;
} }
free(pp);
} }
} }
read_directory_recursive(dir, path, base, baselen, 0, simplify); read_directory_recursive(dir, path, base, baselen, 0, simplify);
free_simplify(simplify); free_simplify(simplify);
free(pp);
qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name); qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name);
qsort(dir->ignored, dir->ignored_nr, sizeof(struct dir_entry *), cmp_name); qsort(dir->ignored, dir->ignored_nr, sizeof(struct dir_entry *), cmp_name);
return dir->nr; return dir->nr;

24
t/t3700-add.sh
View File

@ -104,9 +104,33 @@ test_expect_success 'add ignored ones with -f' '
git ls-files --error-unmatch d.ig/d.if d.ig/d.ig git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
' '
test_expect_success 'add ignored ones with -f' '
rm -f .git/index &&
git add -f d.?? &&
git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
'
test_expect_success '.gitignore with subdirectory' '
rm -f .git/index &&
mkdir -p sub/dir &&
echo "!dir/a.*" >sub/.gitignore &&
>sub/a.ig &&
>sub/dir/a.ig &&
git add sub/dir &&
git ls-files --error-unmatch sub/dir/a.ig &&
rm -f .git/index &&
(
cd sub/dir &&
git add .
) &&
git ls-files --error-unmatch sub/dir/a.ig
'
mkdir 1 1/2 1/3 mkdir 1 1/2 1/3
touch 1/2/a 1/3/b 1/2/c touch 1/2/a 1/3/b 1/2/c
test_expect_success 'check correct prefix detection' ' test_expect_success 'check correct prefix detection' '
rm -f .git/index &&
git add 1/2/a 1/3/b 1/2/c git add 1/2/a 1/3/b 1/2/c
' '