mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/robustify-parse-commit'

Browse Source 
* jk/robustify-parse-commit:
  checkout: do not die when leaving broken detached HEAD
  use parse_commit_or_die instead of custom message
  use parse_commit_or_die instead of segfaulting
  assume parse_commit checks for NULL commit
  assume parse_commit checks commit->object.parsed
  log_tree_diff: die when we fail to parse a commit
This commit is contained in:
Junio C Hamano
2013-12-05 12:54:01 -08:00
parent b2a0afd96a 3c62183929
commit 5bb62059f2
15 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fetch-pack.c
View File

@ -47,9 +47,8 @@ static void rev_list_push(struct commit *commit, int mark)
if (!(commit->object.flags & mark)) {
commit->object.flags |= mark;
if (!(commit->object.parsed))
if (parse_commit(commit))
return;
if (parse_commit(commit))
return;
prio_queue_put(&rev_list, commit);
@ -128,8 +127,7 @@ static const unsigned char *get_rev(void)
return NULL;
commit = prio_queue_get(&rev_list);
if (!commit->object.parsed)
parse_commit(commit);
parse_commit(commit);
parents = commit->parents;
commit->object.flags |= POPPED;