Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkout: use GIT_ASSERT

Browse Source
This commit is contained in:
Edward Thomson
2020-04-05 14:35:23 +01:00
parent e0f3c33d5a
commit 266f26ed92
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/checkout.c
View File

@@ -1243,7 +1243,7 @@ static int checkout_conflict_append_remove(
checkout_data *data = payload;
const char *name;
assert(ancestor || ours || theirs);
GIT_ASSERT_ARG(ancestor || ours || theirs);
if (ancestor)
name = git__strdup(ancestor->path);
@@ -1487,7 +1487,9 @@ static int checkout_stream_write(
static int checkout_stream_close(git_writestream *s)
{
struct checkout_stream *stream = (struct checkout_stream *)s;
assert(stream && stream->open);
GIT_ASSERT_ARG(stream);
GIT_ASSERT_ARG(stream->open);
stream->open = 0;
return p_close(stream->fd);
@@ -1554,7 +1556,7 @@ static int blob_content_to_file(
error = git_filter_list_stream_blob(fl, blob, &writer.base);
assert(writer.open == 0);
GIT_ASSERT(writer.open == 0);
git_filter_list_free(fl);
@@ -1976,7 +1978,7 @@ static int checkout_write_entry(
struct stat st;
int error;
assert (side == conflict->ours || side == conflict->theirs);
GIT_ASSERT(side == conflict->ours || side == conflict->theirs);
if (checkout_target_fullpath(&fullpath, data, side->path) < 0)
return -1;
@@ -2588,7 +2590,7 @@ int git_checkout_iterator(
}
/* Should not have case insensitivity mismatch */
assert(git_iterator_ignore_case(workdir) == git_iterator_ignore_case(baseline));
GIT_ASSERT(git_iterator_ignore_case(workdir) == git_iterator_ignore_case(baseline));
/* Generate baseline-to-target diff which will include an entry for
* every possible update that might need to be made.
@@ -2639,7 +2641,7 @@ int git_checkout_iterator(
(error = checkout_extensions_update_index(&data)) < 0)
goto cleanup;
assert(data.completed_steps == data.total_steps);
GIT_ASSERT(data.completed_steps == data.total_steps);
if (data.opts.perfdata_cb)
data.opts.perfdata_cb(&data.perfdata, data.opts.perfdata_payload);
@@ -2767,7 +2769,8 @@ int git_checkout_head(
git_repository *repo,
const git_checkout_options *opts)
{
assert(repo);
GIT_ASSERT_ARG(repo);
return git_checkout_tree(repo, NULL, opts);
}