Merge pull request #3185 from libgit2/cmn/foreach-cancel-loose

path: error out if the callback returns an error

1 files changed, 4 insertions, 2 deletions

diff --git a/src/path.c b/src/path.c
index 81b4d51df..8f861e68e 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1066,8 +1066,10 @@ int git_path_direach(
 		git_buf_truncate(path, wd_len); /* restore path */
 
 		/* Only set our own error if the callback did not set one already */
-		if (error != 0 && !giterr_last()) {
-			giterr_set_after_callback(error);
+		if (error != 0) {
+			if (!giterr_last())
+				giterr_set_after_callback(error);
+
 			break;
 		}
 	}