mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-25 10:19:24 -06:00
Code Issues Packages Projects Releases 136 Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Taylor Bantle
2022-10-17 12:22:00 -07:00
parent 1931f77844
commit 6b99312a4e
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
go/cmd/dolt/commands/log.go
View File

@@ -359,10 +359,6 @@ func logCommits(ctx context.Context, dEnv *env.DoltEnv, opts *logOpts) int {
var commits []*doltdb.Commit
if opts.excludingCommitSpec == nil {
commits, err = commitwalk.GetTopNTopoOrderedCommitsMatching(ctx, dEnv.DoltDB, h, opts.numLines, matchFunc)
if err != nil {
cli.PrintErrln("Error retrieving commit.")
return 1
}
} else {
excludingCommit, err := dEnv.DoltDB.Resolve(ctx, opts.excludingCommitSpec, dEnv.RepoStateReader().CWBHeadRef())
if err != nil {
@@ -378,10 +374,11 @@ func logCommits(ctx context.Context, dEnv *env.DoltEnv, opts *logOpts) int {
}
commits, err = commitwalk.GetDotDotRevisions(ctx, dEnv.DoltDB, h, dEnv.DoltDB, excludingHash, opts.numLines)
if err != nil {
cli.PrintErrln("Error retrieving commit.")
return 1
}
}
if err != nil {
cli.PrintErrln("Error retrieving commit.")
return 1
}
var commitsInfo []logNode

2
go/libraries/doltcore/env/actions/commitwalk/commitwalk.go vendored
View File

@@ -159,7 +159,7 @@ func newQueue() *q {
//
// Roughly mimics `git log main..feature`.
func GetDotDotRevisions(ctx context.Context, includedDB *doltdb.DoltDB, includedHead hash.Hash, excludedDB *doltdb.DoltDB, excludedHead hash.Hash, num int) ([]*doltdb.Commit, error) {
commitList := make([]*doltdb.Commit, 0)
var commitList []*doltdb.Commit
q := newQueue()
if err := q.SetInvisible(ctx, excludedDB, excludedHead); err != nil {
return nil, err