revision --boundary: fix uncounted case.
When the list is truly limited and get_revision_1() returned NULL, the code incorrectly returned it without switching to boundary emiting mode. Silly. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
892ae6bf13
commit
8839ac9442
16
revision.c
16
revision.c
@ -1301,13 +1301,14 @@ struct commit *get_revision(struct rev_info *revs)
|
|||||||
/*
|
/*
|
||||||
* Now pick up what they want to give us
|
* Now pick up what they want to give us
|
||||||
*/
|
*/
|
||||||
if (!(c = get_revision_1(revs)))
|
c = get_revision_1(revs);
|
||||||
return NULL;
|
if (c) {
|
||||||
while (0 < revs->skip_count) {
|
while (0 < revs->skip_count) {
|
||||||
revs->skip_count--;
|
revs->skip_count--;
|
||||||
c = get_revision_1(revs);
|
c = get_revision_1(revs);
|
||||||
if (!c)
|
if (!c)
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1317,7 +1318,6 @@ struct commit *get_revision(struct rev_info *revs)
|
|||||||
case -1:
|
case -1:
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
/* Although we grabbed it, it is not shown. */
|
|
||||||
c = NULL;
|
c = NULL;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
Loading…
Reference in New Issue
Block a user