summaryrefslogtreecommitdiff
path: root/src/diff_generate.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-11-11 15:20:50 -0500
committerGitHub <noreply@github.com>2021-11-11 15:20:50 -0500
commitceddeed80a21f0d3a3396d90dd61fada361ed745 (patch)
tree1b21dd455b3fbffcd4d5da52f5e8a58785510dd4 /src/diff_generate.c
parent9ab351c0d5330106b5562524cd303cbd5789a1d8 (diff)
parent1a8b2922d953e78bd51fc6d5ef290e1f7e00af3a (diff)
downloadlibgit2-ceddeed80a21f0d3a3396d90dd61fada361ed745.tar.gz
Merge pull request #6104 from libgit2/ethomson/path
path: refactor utility path functions
Diffstat (limited to 'src/diff_generate.c')
-rw-r--r--src/diff_generate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff_generate.c b/src/diff_generate.c
index dc690aa9b..dca16d51a 100644
--- a/src/diff_generate.c
+++ b/src/diff_generate.c
@@ -605,7 +605,7 @@ int git_diff__oid_for_entry(
diff->base.perf.stat_calls++;
if (p_stat(full_path.ptr, &st) < 0) {
- error = git_path_set_error(errno, entry.path, "stat");
+ error = git_fs_path_set_error(errno, entry.path, "stat");
git_str_dispose(&full_path);
return error;
}
@@ -1026,7 +1026,7 @@ static int handle_unmatched_new_item(
git_str *full = NULL;
if (git_iterator_current_workdir_path(&full, info->new_iter) < 0)
return -1;
- if (full && git_path_contains(full, DOT_GIT)) {
+ if (full && git_fs_path_contains(full, DOT_GIT)) {
/* TODO: warning if not a valid git repository */
recurse_into_dir = false;
}