proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-06 08:47:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

attr: Do not walk path if we're at the root

Browse Source
This commit is contained in:
The rugged tests are fragile 2014-09-17 15:23:17 +02:00
parent 4cb7c4a4c7
commit a2b4407dc3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/attr.c
View File

@ -422,10 +422,8 @@ static int collect_attr_files(
/* Resolve path in a non-bare repo */ /* Resolve path in a non-bare repo */
if (workdir != NULL) if (workdir != NULL)
error = git_path_find_dir(&dir, path, workdir); error = git_path_find_dir(&dir, path, workdir);
/* when in a bare repo, find the containing folder if the given else
* path is a subfolder (if not, the containing folder is the root) */ error = git_path_dirname_r(&dir, path);
else if (strchr(path, '/') != NULL)
error = git_path_dirname_r(&dir, path);
if (error < 0) if (error < 0)
goto cleanup; goto cleanup;
@ -449,7 +447,12 @@ static int collect_attr_files(
giterr_clear(); /* no error even if there is no index */ giterr_clear(); /* no error even if there is no index */
info.files = files; info.files = files;
error = git_path_walk_up(&dir, workdir, push_one_attr, &info); if (!strcmp(dir.ptr, ".")) {
error = push_one_attr(&info, "");
} else {
error = git_path_walk_up(&dir, workdir, push_one_attr, &info);
}
if (error < 0) if (error < 0)
goto cleanup; goto cleanup;