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

Merge branch 'rs/pop-commit' into maint

Browse Source 
Code simplification.

* rs/pop-commit:
  use pop_commit() for consuming the first entry of a struct commit_list
This commit is contained in:
Junio C Hamano
2015-12-11 11:14:12 -08:00
parent 8c0a546670 e510ab8988
commit 0af22d6fff
10 changed files with 31 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
revision.c
View File

@ -153,10 +153,7 @@ void mark_parents_uninteresting(struct commit *commit)
commit_list_insert(l->item, &parents);
while (parents) {
struct commit *commit = parents->item;
l = parents;
parents = parents->next;
free(l);
struct commit *commit = pop_commit(&parents);
while (commit) {
/*
@ -1102,14 +1099,10 @@ static int limit_list(struct rev_info *revs)
}
while (list) {
struct commit_list *entry = list;
struct commit *commit = list->item;
struct commit *commit = pop_commit(&list);
struct object *obj = &commit->object;
show_early_output_fn_t show;
list = list->next;
free(entry);
if (commit == interesting_cache)
interesting_cache = NULL;
@ -2733,10 +2726,7 @@ static void simplify_merges(struct rev_info *revs)
yet_to_do = NULL;
tail = &yet_to_do;
while (list) {
commit = list->item;
next = list->next;
free(list);
list = next;
commit = pop_commit(&list);
tail = simplify_one(revs, commit, tail);
}
}
@ -2748,10 +2738,7 @@ static void simplify_merges(struct rev_info *revs)
while (list) {
struct merge_simplify_state *st;
commit = list->item;
next = list->next;
free(list);
list = next;
commit = pop_commit(&list);
st = locate_simplify_state(revs, commit);
if (st->simplified == commit)
tail = &commit_list_insert(commit, tail)->next;
@ -3125,11 +3112,7 @@ static struct commit *get_revision_1(struct rev_info *revs)
return NULL;
do {
struct commit_list *entry = revs->commits;
struct commit *commit = entry->item;
revs->commits = entry->next;
free(entry);
struct commit *commit = pop_commit(&revs->commits);
if (revs->reflog_info) {
save_parents(revs, commit);