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

fix deletion of .git/objects sub-directories in git-prune/repack

Browse Source 
Both git-prune and git-repack (and thus, git-gc) try to rmdir while
holding a DIR* handle on the directory.  This can leave dangling
empty directories in the .git/objects on platforms where directory
cannot be removed while they are open.

First call closedir() and then rmdir(); that is more logical ordering.

Reported-by: John Chen <john0312@gmail.com>
Reported-by: Stefan Naewe <stefan.naewe@gmail.com>
Signed-off-by: Karsten Blees <blees@dcon.de>
Improved-and-Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karsten Blees 2012-03-06 10:18:41 +01:00 committed by Junio C Hamano
parent 0dbe6592cc
commit d34e70d6b8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/prune-packed.c
View File

@ -35,8 +35,6 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
unlink_or_warn(pathname); unlink_or_warn(pathname);
display_progress(progress, i + 1); display_progress(progress, i + 1);
} }
pathname[len] = 0;
rmdir(pathname);
} }
void prune_packed_objects(int opts) void prune_packed_objects(int opts)
@ -65,6 +63,8 @@ void prune_packed_objects(int opts)
continue; continue;
prune_dir(i, d, pathname, len + 3, opts); prune_dir(i, d, pathname, len + 3, opts);
closedir(d); closedir(d);
pathname[len + 2] = '\0';
rmdir(pathname);
} }
stop_progress(&progress); stop_progress(&progress);
} }

2
builtin/prune.c
View File

@ -85,9 +85,9 @@ static int prune_dir(int i, char *path)
} }
fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name); fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name);
} }
closedir(dir);
if (!show_only) if (!show_only)
rmdir(path); rmdir(path);
closedir(dir);
return 0; return 0;
} }