proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-24 07:03:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3423 from libgit2/cmn/push-tests-inline-oid

Browse Source 
push: put the git_oid inline in the test structure
This commit is contained in:
Carlos Martín Nieto 2015-09-13 19:43:55 +02:00
commit f2b25261cf
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/online/push.c
View File

@ -299,7 +299,7 @@ static void verify_update_tips_callback(git_remote *remote, expected_ref expecte
goto failed; goto failed;
} }
if (git_oid_cmp(expected_refs[i].oid, tip->new_oid) != 0) { if (git_oid_cmp(expected_refs[i].oid, &tip->new_oid) != 0) {
git_buf_printf(&msg, "Updated tip ID does not match expected ID"); git_buf_printf(&msg, "Updated tip ID does not match expected ID");
failed = 1; failed = 1;
goto failed; goto failed;

11
tests/online/push_util.c
View File

@ -9,8 +9,6 @@ const git_oid OID_ZERO = {{ 0 }};
void updated_tip_free(updated_tip *t) void updated_tip_free(updated_tip *t)
{ {
git__free(t->name); git__free(t->name);
git__free(t->old_oid);
git__free(t->new_oid);
git__free(t); git__free(t);
} }
@ -46,14 +44,11 @@ int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid *
updated_tip *t; updated_tip *t;
record_callbacks_data *record_data = (record_callbacks_data *)data; record_callbacks_data *record_data = (record_callbacks_data *)data;
cl_assert(t = git__malloc(sizeof(*t))); cl_assert(t = git__calloc(1, sizeof(*t)));
cl_assert(t->name = git__strdup(refname)); cl_assert(t->name = git__strdup(refname));
cl_assert(t->old_oid = git__malloc(sizeof(*t->old_oid))); git_oid_cpy(&t->old_oid, a);
git_oid_cpy(t->old_oid, a); git_oid_cpy(&t->new_oid, b);
cl_assert(t->new_oid = git__malloc(sizeof(*t->new_oid)));
git_oid_cpy(t->new_oid, b);
git_vector_insert(&record_data->updated_tips, t); git_vector_insert(&record_data->updated_tips, t);

4
tests/online/push_util.h
View File

@ -16,8 +16,8 @@ extern const git_oid OID_ZERO;
typedef struct { typedef struct {
char *name; char *name;
git_oid *old_oid; git_oid old_oid;
git_oid *new_oid; git_oid new_oid;
} updated_tip; } updated_tip;
typedef struct { typedef struct {