Commit 899716b45d5a1d038a1be238c268027a73773d8e
2015-05-15T12:15:45
path: don't let direach overwrite the callback's error message This function deals with functions doing IO which means the amount of errors that can happen is quit large. It does not help if it always ovewrites the underlying error message with a less understandable version of "something went wrong". Instead, only use this generic message if there was no error set by the callback.
diff --git a/src/path.c b/src/path.c
index 58d7192..3d1a9e4 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1038,11 +1038,13 @@ int git_path_direach(
if ((error = git_buf_put(path, de_path, de_len)) < 0)
break;
+ giterr_clear();
error = fn(arg, path);
git_buf_truncate(path, wd_len); /* restore path */
- if (error != 0) {
+ /* Only set our own error if the callback did not set one already */
+ if (error != 0 && !giterr_last()) {
giterr_set_after_callback(error);
break;
}