From c2c397422f472e4733d02eb03b86a71a6ca9508c Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Sun, 3 Jul 2022 06:42:17 +0000 Subject: [PATCH] git/log: fix log count saved wrong version when rebasing, oops. --- sys/src/cmd/git/log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/src/cmd/git/log.c b/sys/src/cmd/git/log.c index ac60a7d4d..2a8f63084 100644 --- a/sys/src/cmd/git/log.c +++ b/sys/src/cmd/git/log.c @@ -14,7 +14,7 @@ Biobuf *out; char *queryexpr; char *commitid; int shortlog; -int msgcount; +int msgcount = -1; Objset done; Objq objq; @@ -181,7 +181,7 @@ showquery(char *q) if((n = resolverefs(&h, q)) == -1) sysfatal("resolve: %r"); - for(i = 0; i < n && msgcount-- > 0; i++){ + for(i = 0; i < n && (msgcount == -1 || msgcount-- > 0); i++){ if((o = readobject(h[i])) == nil) sysfatal("read %H: %r", h[i]); show(o); @@ -207,7 +207,7 @@ showcommits(char *c) qinit(&objq); osinit(&done); qput(&objq, o, 0); - while(qpop(&objq, &e) && msgcount-- > 0){ + while(qpop(&objq, &e) && (msgcount == -1 || msgcount-- > 0)){ show(e.o); for(i = 0; i < e.o->commit->nparent; i++){ if(oshas(&done, e.o->commit->parent[i]))