From 15debaf5da2821e6f97038218b46d9fb3c755631 Mon Sep 17 00:00:00 2001
From: Russell Belfer <arrbee@arrbee.com>
Date: Wed, 11 Jan 2012 17:28:25 -0800
Subject: [PATCH] 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.
---
 src/fileops.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/fileops.c b/src/fileops.c
index 1d991b36d..3412a47e2 100644
--- 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);