Commit 9d160ba8 by Vicent Martí

diff: Fix rebase breackage

parent 1a481123
...@@ -235,7 +235,7 @@ int git_attr_cache__lookup_or_create_file( ...@@ -235,7 +235,7 @@ int git_attr_cache__lookup_or_create_file(
return GIT_SUCCESS; return GIT_SUCCESS;
} }
if (loader && git_path_exists(filename) != GIT_SUCCESS) { if (loader && git_path_exists(filename) == false) {
*file_ptr = NULL; *file_ptr = NULL;
return GIT_SUCCESS; return GIT_SUCCESS;
} }
......
...@@ -440,7 +440,7 @@ static int workdir_iterator__update_entry(workdir_iterator *wi) ...@@ -440,7 +440,7 @@ static int workdir_iterator__update_entry(workdir_iterator *wi)
/* detect submodules */ /* detect submodules */
if (S_ISDIR(wi->entry.mode) && if (S_ISDIR(wi->entry.mode) &&
git_path_contains(&wi->path, DOT_GIT) == GIT_SUCCESS) git_path_contains(&wi->path, DOT_GIT) == true)
wi->entry.mode = S_IFGITLINK; wi->entry.mode = S_IFGITLINK;
return GIT_SUCCESS; return GIT_SUCCESS;
......
...@@ -480,7 +480,7 @@ static int fn_locate_object_short_oid(void *state, git_buf *pathbuf) { ...@@ -480,7 +480,7 @@ static int fn_locate_object_short_oid(void *state, git_buf *pathbuf) {
return GIT_SUCCESS; return GIT_SUCCESS;
} }
if (git_path_isdir(pathbuf->ptr) == true) { if (git_path_isdir(pathbuf->ptr) == false) {
/* We are already in the directory matching the 2 first hex characters, /* We are already in the directory matching the 2 first hex characters,
* compare the first ncmp characters of the oids */ * compare the first ncmp characters of the oids */
if (!memcmp(sstate->short_oid + 2, if (!memcmp(sstate->short_oid + 2,
......
...@@ -171,7 +171,7 @@ int git_repository_open(git_repository **repo_out, const char *path) ...@@ -171,7 +171,7 @@ int git_repository_open(git_repository **repo_out, const char *path)
* of the working dir, by testing if it contains a `.git` * of the working dir, by testing if it contains a `.git`
* folder inside of it. * folder inside of it.
*/ */
if (git_path_contains_dir(&path_buf, GIT_DIR) == GIT_SUCCESS) if (git_path_contains_dir(&path_buf, GIT_DIR) == true)
git_buf_joinpath(&path_buf, path_buf.ptr, GIT_DIR); git_buf_joinpath(&path_buf, path_buf.ptr, GIT_DIR);
if (quickcheck_repository_dir(&path_buf) < GIT_SUCCESS) { if (quickcheck_repository_dir(&path_buf) < GIT_SUCCESS) {
......
...@@ -7,8 +7,8 @@ git_tree *resolve_commit_oid_to_tree( ...@@ -7,8 +7,8 @@ git_tree *resolve_commit_oid_to_tree(
{ {
size_t len = strlen(partial_oid); size_t len = strlen(partial_oid);
git_oid oid; git_oid oid;
git_object *obj; git_object *obj = NULL;
git_tree *tree; git_tree *tree = NULL;
if (git_oid_fromstrn(&oid, partial_oid, len) == 0) if (git_oid_fromstrn(&oid, partial_oid, len) == 0)
git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY); git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY);
......
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