Commit 83f71b12 by yuangli

fix build errors

parent 52ba17f3
...@@ -6,3 +6,4 @@ ...@@ -6,3 +6,4 @@
CMakeSettings.json CMakeSettings.json
.vs .vs
.idea .idea
.cache
...@@ -227,7 +227,7 @@ typedef enum { ...@@ -227,7 +227,7 @@ typedef enum {
GIT_OPT_GET_EXTENSIONS, GIT_OPT_GET_EXTENSIONS,
GIT_OPT_SET_EXTENSIONS, GIT_OPT_SET_EXTENSIONS,
GIT_OPT_GET_OWNER_VALIDATION, GIT_OPT_GET_OWNER_VALIDATION,
GIT_OPT_SET_OWNER_VALIDATION GIT_OPT_SET_OWNER_VALIDATION,
GIT_OPT_ENABLE_SHALLOW GIT_OPT_ENABLE_SHALLOW
} git_libgit2_opt_t; } git_libgit2_opt_t;
......
...@@ -736,13 +736,13 @@ static int load_grafts(git_repository *repo) ...@@ -736,13 +736,13 @@ static int load_grafts(git_repository *repo)
int error; int error;
if ((error = git_repository_item_path(&path, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 || if ((error = git_repository_item_path(&path, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
(error = git_buf_joinpath(&path, path.ptr, "grafts")) < 0 || (error = git_str_joinpath(&path, path.ptr, "grafts")) < 0 ||
(error = git_grafts_from_file(&repo->grafts, path.ptr)) < 0) (error = git_grafts_from_file(&repo->grafts, path.ptr)) < 0)
goto error; goto error;
git_buf_clear(&path); git_str_clear(&path);
if ((error = git_buf_joinpath(&path, repo->gitdir, "shallow")) < 0 || if ((error = git_str_joinpath(&path, repo->gitdir, "shallow")) < 0 ||
(error = git_grafts_from_file(&repo->shallow_grafts, path.ptr)) < 0) (error = git_grafts_from_file(&repo->shallow_grafts, path.ptr)) < 0)
goto error; goto error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment