summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-08-29 21:18:38 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-29 22:20:51 -0700
commit498bcd3159ae3711f2beea2ea497cdc09856ee79 (patch)
treeee7d6a7e80e6a75d3f87cd8e18a66a4ed4a3a3f5 /revision.c
parent65347030590bcc251a9ff2ed96487a0f1b9e9fa8 (diff)
downloadgit-498bcd3159ae3711f2beea2ea497cdc09856ee79.tar.gz
rev-list: fix --reverse interaction with --parents
--reverse did not interact well with --parents, as the included test case shows: in a history like A--B. \ \ `C--M--D the command git rev-list --reverse --parents --full-history HEAD erroneously lists D as having no parents at all. (Without --reverse, it correctly lists M.) This is caused by the machinery driving --reverse: it first grabs all commits through the normal routines, then runs them through the same routines again, effectively simplifying them twice. Fix this by moving the --reverse one level up, into get_revision(). This way we can cleanly grab all commits via the normal calls, then just pop them off the list one by one without interfering with get_revision_internal(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c38
1 files changed, 17 insertions, 21 deletions
diff --git a/revision.c b/revision.c
index 0aaa4c10b9..d797f05c93 100644
--- a/revision.c
+++ b/revision.c
@@ -1786,26 +1786,6 @@ static struct commit *get_revision_internal(struct rev_info *revs)
return c;
}
- if (revs->reverse) {
- int limit = -1;
-
- if (0 <= revs->max_count) {
- limit = revs->max_count;
- if (0 < revs->skip_count)
- limit += revs->skip_count;
- }
- l = NULL;
- while ((c = get_revision_1(revs))) {
- commit_list_insert(c, &l);
- if ((0 < limit) && !--limit)
- break;
- }
- revs->commits = l;
- revs->reverse = 0;
- revs->max_count = -1;
- c = NULL;
- }
-
/*
* Now pick up what they want to give us
*/
@@ -1878,7 +1858,23 @@ static struct commit *get_revision_internal(struct rev_info *revs)
struct commit *get_revision(struct rev_info *revs)
{
- struct commit *c = get_revision_internal(revs);
+ struct commit *c;
+ struct commit_list *reversed;
+
+ if (revs->reverse) {
+ reversed = NULL;
+ while ((c = get_revision_internal(revs))) {
+ commit_list_insert(c, &reversed);
+ }
+ revs->commits = reversed;
+ revs->reverse = 0;
+ revs->reverse_output_stage = 1;
+ }
+
+ if (revs->reverse_output_stage)
+ return pop_commit(&revs->commits);
+
+ c = get_revision_internal(revs);
if (c && revs->graph)
graph_update(revs->graph, c);
return c;