Fix bug in dir_for_path

The last checkin accidentally broke dir_for_path by propogating
the dirname return code even when there was no error.

diff --git a/src/fileops.c b/src/fileops.c
index 1d991b36dda876fc3e61b87cbfd3c8289c3c2285..3412a47e214f4cef1602632b3d808bd6fc1e7673 100644 (file)
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -551,7 +551,8 @@ int git_futils_dir_for_path(git_buf *dir, const char *path, const char *base)
 
        /* call dirname if this is not a directory */
        if (error == GIT_SUCCESS && git_futils_isdir(dir->ptr) != GIT_SUCCESS)
-               error = git_path_dirname_r(dir, dir->ptr);
+               if (git_path_dirname_r(dir, dir->ptr) < GIT_SUCCESS)
+                       error = git_buf_lasterror(dir);
 
        if (error == GIT_SUCCESS)
                error = git_path_to_dir(dir);