Skip to content

Commit

Permalink
Fix directory finding for attrs
Browse files Browse the repository at this point in the history
The fix to support attrs on bare repos went a little too far
in trying to avoid using the working directory and ended up
not processing the input path quite correctly.
  • Loading branch information
arrbee committed May 7, 2012
1 parent df0c895 commit cba285d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/attr.c
Expand Up @@ -450,11 +450,11 @@ static int collect_attr_files(
git_vector_init(files, 4, NULL) < 0)
return -1;

/* given a unrooted path in a non-bare repo, resolve it */
if (workdir && git_path_root(path) < 0)
/* Resolve path in a non-bare repo */
if (workdir != NULL)
error = git_path_find_dir(&dir, path, workdir);
else
error = git_buf_sets(&dir, path);
error = git_path_dirname_r(&dir, path);
if (error < 0)
goto cleanup;

Expand Down

0 comments on commit cba285d

Please sign in to comment.