proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-06 18:52:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

diff: Fix rebase breackage

Browse Source
This commit is contained in:
Vicent Martí 2012-03-06 01:37:56 +01:00
parent 1a48112342
commit 9d160ba855
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/attr.c
View File

@ -235,7 +235,7 @@ int git_attr_cache__lookup_or_create_file(
return GIT_SUCCESS;
}
if (loader && git_path_exists(filename) != GIT_SUCCESS) {
if (loader && git_path_exists(filename) == false) {
*file_ptr = NULL;
return GIT_SUCCESS;
}

2
src/iterator.c
View File

@ -440,7 +440,7 @@ static int workdir_iterator__update_entry(workdir_iterator *wi)
/* detect submodules */
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;
return GIT_SUCCESS;

2
src/odb_loose.c
View File

@ -480,7 +480,7 @@ static int fn_locate_object_short_oid(void *state, git_buf *pathbuf) {
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,
* compare the first ncmp characters of the oids */
if (!memcmp(sstate->short_oid + 2,

2
src/repository.c
View File

@ -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`
* 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);
if (quickcheck_repository_dir(&path_buf) < GIT_SUCCESS) {

4
tests-clar/diff/diff_helpers.c
View File

@ -7,8 +7,8 @@ git_tree *resolve_commit_oid_to_tree(
{
size_t len = strlen(partial_oid);
git_oid oid;
git_object *obj;
git_tree *tree;
git_object *obj = NULL;
git_tree *tree = NULL;
if (git_oid_fromstrn(&oid, partial_oid, len) == 0)
git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY);