Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
8455a270
Commit
8455a270
authored
Jul 01, 2018
by
Etienne Samson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests: add missing cl_git_pass to tests
Reported by Coverity, CID 1393678-1393697.
parent
6ae6491e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
24 deletions
+24
-24
tests/checkout/conflict.c
+15
-15
tests/checkout/tree.c
+3
-3
tests/describe/t6120.c
+2
-2
tests/diff/workdir.c
+2
-2
tests/merge/workdir/dirty.c
+1
-1
tests/stash/apply.c
+1
-1
No files found.
tests/checkout/conflict.c
View file @
8455a270
...
...
@@ -93,7 +93,7 @@ static void create_index(struct checkout_index_entry *entries, size_t entries_le
if
(
entries
[
i
].
stage
==
3
&&
(
i
==
0
||
strcmp
(
entries
[
i
-
1
].
path
,
entries
[
i
].
path
)
!=
0
||
entries
[
i
-
1
].
stage
!=
2
))
p_unlink
(
git_buf_cstr
(
&
path
));
git_index_remove_bypath
(
g_index
,
entries
[
i
].
path
);
cl_git_pass
(
git_index_remove_bypath
(
g_index
,
entries
[
i
].
path
)
);
}
for
(
i
=
0
;
i
<
entries_len
;
i
++
)
{
...
...
@@ -133,7 +133,7 @@ static void create_conflicting_index(void)
};
create_index
(
checkout_index_entries
,
3
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
}
static
void
ensure_workdir_contents
(
const
char
*
path
,
const
char
*
contents
)
...
...
@@ -271,7 +271,7 @@ void test_checkout_conflict__automerge(void)
};
create_index
(
checkout_index_entries
,
3
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -303,7 +303,7 @@ void test_checkout_conflict__directory_file(void)
opts
.
checkout_strategy
|=
GIT_CHECKOUT_SAFE
;
create_index
(
checkout_index_entries
,
12
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -344,7 +344,7 @@ void test_checkout_conflict__directory_file_with_custom_labels(void)
opts
.
their_label
=
"branch"
;
create_index
(
checkout_index_entries
,
12
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -383,7 +383,7 @@ void test_checkout_conflict__link_file(void)
opts
.
checkout_strategy
|=
GIT_CHECKOUT_SAFE
;
create_index
(
checkout_index_entries
,
12
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -410,7 +410,7 @@ void test_checkout_conflict__links(void)
opts
.
checkout_strategy
|=
GIT_CHECKOUT_SAFE
;
create_index
(
checkout_index_entries
,
5
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -431,7 +431,7 @@ void test_checkout_conflict__add_add(void)
opts
.
checkout_strategy
|=
GIT_CHECKOUT_SAFE
;
create_index
(
checkout_index_entries
,
2
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -472,7 +472,7 @@ void test_checkout_conflict__mode_change(void)
opts
.
checkout_strategy
|=
GIT_CHECKOUT_SAFE
;
create_index
(
checkout_index_entries
,
18
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -604,7 +604,7 @@ void test_checkout_conflict__renames(void)
create_index
(
checkout_index_entries
,
41
);
create_index_names
(
checkout_name_entries
,
9
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -789,7 +789,7 @@ void test_checkout_conflict__rename_keep_ours(void)
create_index
(
checkout_index_entries
,
41
);
create_index_names
(
checkout_name_entries
,
9
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -922,7 +922,7 @@ void test_checkout_conflict__name_mangled_file_exists_in_workdir(void)
create_index
(
checkout_index_entries
,
24
);
create_index_names
(
checkout_name_entries
,
6
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
/* Add some files on disk that conflict with the names that would be chosen
* for the files written for each side. */
...
...
@@ -1012,7 +1012,7 @@ void test_checkout_conflict__update_only(void)
opts
.
checkout_strategy
|=
GIT_CHECKOUT_UPDATE_ONLY
;
create_index
(
checkout_index_entries
,
3
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
p_mkdir
(
"merge-resolve/directory_file-two"
,
0777
));
cl_git_rewritefile
(
"merge-resolve/directory_file-two/file"
,
CONFLICTING_OURS_FILE
);
...
...
@@ -1063,7 +1063,7 @@ void test_checkout_conflict__path_filters(void)
opts
.
paths
=
patharray
;
create_index
(
checkout_index_entries
,
12
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
@@ -1120,7 +1120,7 @@ void test_checkout_conflict__report_progress(void)
create_index
(
checkout_index_entries
,
12
);
git_index_write
(
g_index
);
cl_git_pass
(
git_index_write
(
g_index
)
);
cl_git_pass
(
git_checkout_index
(
g_repo
,
g_index
,
&
opts
));
...
...
tests/checkout/tree.c
View file @
8455a270
...
...
@@ -954,7 +954,7 @@ static void create_conflict(const char *path)
git_oid_fromstr
(
&
entry
.
id
,
"2bd0a343aeef7a2cf0d158478966a6e587ff3863"
);
cl_git_pass
(
git_index_add
(
index
,
&
entry
));
git_index_write
(
index
);
cl_git_pass
(
git_index_write
(
index
)
);
git_index_free
(
index
);
}
...
...
@@ -1127,7 +1127,7 @@ void test_checkout_tree__removes_conflicts(void)
create_conflict
(
"other.txt"
);
cl_git_mkfile
(
"testrepo/other.txt"
,
"This is another conflict file.
\n
"
);
git_index_write
(
index
);
cl_git_pass
(
git_index_write
(
index
)
);
cl_git_pass
(
git_checkout_tree
(
g_repo
,
(
const
git_object
*
)
commit
,
&
opts
));
...
...
@@ -1172,7 +1172,7 @@ void test_checkout_tree__removes_conflicts_only_by_pathscope(void)
create_conflict
(
"other.txt"
);
cl_git_mkfile
(
"testrepo/other.txt"
,
"This is another conflict file.
\n
"
);
git_index_write
(
index
);
cl_git_pass
(
git_index_write
(
index
)
);
cl_git_pass
(
git_checkout_tree
(
g_repo
,
(
const
git_object
*
)
commit
,
&
opts
));
...
...
tests/describe/t6120.c
View file @
8455a270
...
...
@@ -104,8 +104,8 @@ static void commit_and_tag(
cl_git_append2file
(
"describe/file"
,
"
\n
"
);
git_index_add_bypath
(
index
,
"describe/file"
);
git_index_write
(
index
);
cl_git_pass
(
git_index_add_bypath
(
index
,
"describe/file"
)
);
cl_git_pass
(
git_index_write
(
index
)
);
*
time
+=
10
;
cl_repo_commit_from_index
(
&
commit_id
,
repo
,
NULL
,
*
time
,
commit_msg
);
...
...
tests/diff/workdir.c
View file @
8455a270
...
...
@@ -1910,7 +1910,7 @@ void test_diff_workdir__binary_detection(void)
cl_git_write2file
(
b
.
ptr
,
data
[
i
].
ptr
,
data
[
i
].
size
,
O_WRONLY
|
O_TRUNC
,
0664
);
}
git_index_write
(
idx
);
cl_git_pass
(
git_index_write
(
idx
)
);
cl_git_pass
(
git_diff_index_to_workdir
(
&
diff
,
g_repo
,
NULL
,
NULL
));
...
...
@@ -1938,7 +1938,7 @@ void test_diff_workdir__binary_detection(void)
cl_git_write2file
(
b
.
ptr
,
"baseline
\n
"
,
9
,
O_WRONLY
|
O_TRUNC
,
0664
);
}
git_index_write
(
idx
);
cl_git_pass
(
git_index_write
(
idx
)
);
cl_git_pass
(
git_diff_index_to_workdir
(
&
diff
,
g_repo
,
NULL
,
NULL
));
...
...
tests/merge/workdir/dirty.c
View file @
8455a270
...
...
@@ -337,7 +337,7 @@ void test_merge_workdir_dirty__identical_staged_files_allowed(void)
for
(
i
=
0
,
content
=
result_contents
[
i
];
content
[
0
];
content
=
result_contents
[
++
i
])
{
stage_content
(
content
);
git_index_write
(
repo_index
);
cl_git_pass
(
git_index_write
(
repo_index
)
);
cl_git_pass
(
merge_branch
());
}
}
...
...
tests/stash/apply.c
View file @
8455a270
...
...
@@ -34,7 +34,7 @@ void test_stash_apply__initialize(void)
cl_git_pass
(
git_index_add_bypath
(
repo_index
,
"who"
));
cl_git_pass
(
git_index_add_bypath
(
repo_index
,
"why"
));
cl_git_pass
(
git_index_add_bypath
(
repo_index
,
"where"
));
git_index_write
(
repo_index
);
cl_git_pass
(
git_index_write
(
repo_index
)
);
cl_git_rewritefile
(
"stash/where"
,
"....
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment