Merge branch 'main' into fix-16802-add-primary-key-to-resource_index

techknowlogick · web-flow · commit 76cd01f223d2 · 2021-08-24T22:02:25.000-04:00
diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go
@@ -167,6 +167,9 @@ func (g *LogNameStatusRepoParser) Next(treepath string, paths2ids map[string]int
 				return nil, err
 			}
 		}
+		if len(g.next) == 0 {
+			return &ret, nil
+		}
 		if g.next[0] == '\x00' {
 			g.buffull = false
 			g.next, err = g.rd.ReadSlice('\x00')
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go
@@ -217,7 +217,7 @@ func loadBranches(ctx *context.Context, skip, limit int) ([]*Branch, int) {
 		branches = append(branches, deletedBranches...)
 	}
 
-	return branches, totalNumOfBranches - 1
+	return branches, totalNumOfBranches
 }
 
 func loadOneBranch(ctx *context.Context, rawBranch *git.Branch, protectedBranches []*models.ProtectedBranch,

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,9 @@ func (g *LogNameStatusRepoParser) Next(treepath string, paths2ids map[string]int`
`167`	`167`	`return nil, err`
`168`	`168`	`}`
`169`	`169`	`}`
	`170`	`+ if len(g.next) == 0 {`
	`171`	`+ return &ret, nil`
	`172`	`+ }`
`170`	`173`	`if g.next[0] == '\x00' {`
`171`	`174`	`g.buffull = false`
`172`	`175`	`g.next, err = g.rd.ReadSlice('\x00')`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ func loadBranches(ctx context.Context, skip, limit int) ([]Branch, int) {`
`217`	`217`	`branches = append(branches, deletedBranches...)`
`218`	`218`	`}`
`219`	`219`
`220`		`- return branches, totalNumOfBranches - 1`
	`220`	`+ return branches, totalNumOfBranches`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`func loadOneBranch(ctx context.Context, rawBranch git.Branch, protectedBranches []*models.ProtectedBranch,`