diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-20 16:13:24 -0800 |
| commit | 428ae2eff0f7b68f8bbb1fd462aca5112614427d (patch) | |
| tree | f8c71a2f98f37ac28e672437236af6341ba0e611 /revision.c | |
| parent | 356eff534cfb181cb65f92240692ff4306e3212a (diff) | |
| parent | 3131b713013f06285cad3ffdcc61f417ac4ba158 (diff) | |
| download | git-428ae2eff0f7b68f8bbb1fd462aca5112614427d.tar.gz | |
Merge branch 'lt/revision-walker'
* lt/revision-walker:
Add "--show-all" revision walker flag for debugging
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/revision.c b/revision.c index b1aebf8999..d3e8658104 100644 --- a/revision.c +++ b/revision.c @@ -564,6 +564,12 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs) free_patch_ids(&ids); } +static void add_to_list(struct commit_list **p, struct commit *commit, struct commit_list *n) +{ + p = &commit_list_insert(commit, p)->next; + *p = n; +} + static int limit_list(struct rev_info *revs) { struct commit_list *list = revs->commits; @@ -585,9 +591,13 @@ static int limit_list(struct rev_info *revs) return -1; if (obj->flags & UNINTERESTING) { mark_parents_uninteresting(commit); - if (everybody_uninteresting(list)) + if (everybody_uninteresting(list)) { + if (revs->show_all) + add_to_list(p, commit, list); break; - continue; + } + if (!revs->show_all) + continue; } if (revs->min_age != -1 && (commit->date > revs->min_age)) continue; @@ -1063,6 +1073,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch revs->dense = 0; continue; } + if (!strcmp(arg, "--show-all")) { + revs->show_all = 1; + continue; + } if (!strcmp(arg, "--remove-empty")) { revs->remove_empty_trees = 1; continue; @@ -1446,6 +1460,8 @@ enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit) return commit_ignore; if (revs->unpacked && has_sha1_pack(commit->object.sha1, revs->ignore_packed)) return commit_ignore; + if (revs->show_all) + return commit_show; if (commit->object.flags & UNINTERESTING) return commit_ignore; if (revs->min_age != -1 && (commit->date > revs->min_age)) |