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

Merge pull request #3466 from libgit2/cmn/quick-parse-64

Browse Source 
revwalk: make commit list use 64 bits for time
This commit is contained in:
Edward Thomson 2015-10-15 07:10:48 -07:00
commit 4280fabb9f
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/commit_list.c
View File

@ -110,7 +110,7 @@ static int commit_quick_parse(
const uint8_t *buffer_end = buffer + buffer_len; const uint8_t *buffer_end = buffer + buffer_len;
const uint8_t *parents_start, *committer_start; const uint8_t *parents_start, *committer_start;
int i, parents = 0; int i, parents = 0;
int commit_time; int64_t commit_time;
buffer += strlen("tree ") + GIT_OID_HEXSZ + 1; buffer += strlen("tree ") + GIT_OID_HEXSZ + 1;
@ -166,10 +166,10 @@ static int commit_quick_parse(
buffer--; buffer--;
} }
if ((buffer == committer_start) || (git__strtol32(&commit_time, (char *)(buffer + 1), NULL, 10) < 0)) if ((buffer == committer_start) || (git__strtol64(&commit_time, (char *)(buffer + 1), NULL, 10) < 0))
return commit_error(commit, "cannot parse commit time"); return commit_error(commit, "cannot parse commit time");
commit->time = (time_t)commit_time; commit->time = commit_time;
commit->parsed = 1; commit->parsed = 1;
return 0; return 0;
} }

2
src/commit_list.h
View File

@ -22,7 +22,7 @@
typedef struct git_commit_list_node { typedef struct git_commit_list_node {
git_oid oid; git_oid oid;
uint32_t time; int64_t time;
unsigned int seen:1, unsigned int seen:1,
uninteresting:1, uninteresting:1,
topo_delay:1, topo_delay:1,

35
tests/revwalk/basic.c
View File

@ -437,3 +437,38 @@ void test_revwalk_basic__mimic_git_rev_list(void)
cl_git_fail_with(git_revwalk_next(&oid, _walk), GIT_ITEROVER); cl_git_fail_with(git_revwalk_next(&oid, _walk), GIT_ITEROVER);
} }
void test_revwalk_basic__big_timestamp(void)
{
git_reference *head;
git_commit *tip;
git_signature *sig;
git_tree *tree;
git_oid id;
int error;
revwalk_basic_setup_walk("testrepo.git");
cl_git_pass(git_repository_head(&head, _repo));
cl_git_pass(git_reference_peel((git_object **) &tip, head, GIT_OBJ_COMMIT));
/* Commit with a far-ahead timestamp, we should be able to parse it in the revwalk */
cl_git_pass(git_signature_new(&sig, "Joe", "joe@example.com", 2399662595, 0));
cl_git_pass(git_commit_tree(&tree, tip));
cl_git_pass(git_commit_create(&id, _repo, "HEAD", sig, sig, NULL, "some message", tree, 1, &tip));
cl_git_pass(git_revwalk_push_head(_walk));
while ((error = git_revwalk_next(&id, _walk)) == 0) {
/* nothing */
}
cl_assert_equal_i(GIT_ITEROVER, error);
git_tree_free(tree);
git_commit_free(tip);
git_reference_free(head);
git_signature_free(sig);
}