mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-10 08:49:43 -06:00
Code Issues Packages Projects Releases 118 Wiki Activity

updates dolt commit to properly display skip empty commit message

Browse Source
This commit is contained in:
Stephanie You
2023-06-15 17:41:07 -07:00
parent a803adbc9a
commit 65719c7246
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
go/cmd/dolt/commands/commit.go
View File

@@ -158,14 +158,21 @@ func performCommit(ctx context.Context, commandStr string, args []string, cliCtx
return 1, false
}
_, _, err = queryist.Query(sqlCtx, q)
schema, rowIter, err := queryist.Query(sqlCtx, q)
if err != nil {
cli.Println(err.Error())
return 1, false
}
resultRow, err := sql.RowIterToRows(sqlCtx, schema, rowIter)
if err != nil {
return 0, false
}
if resultRow == nil {
return 0, true
}
// TODO: when dolt log is migrated, remove this block printing out the commit and print with a dolt log call in Exec()
schema, rowIter, err := queryist.Query(sqlCtx, "select * from dolt_log() limit 1")
schema, rowIter, err = queryist.Query(sqlCtx, "select * from dolt_log() limit 1")
if err != nil {
cli.Println(err.Error())
return 1, false

3
integration-tests/bats/commit.bats
View File

@@ -110,8 +110,9 @@ teardown() {
[ $original_head != $new_head ]
# When no changes are staged, --skip-empty skips creating the commit
dolt commit --skip-empty -m "commit message"
run dolt commit --skip-empty -m "commit message"
[ $new_head = $(get_head_commit) ]
[[ "$output" =~ "Skipping empty commit" ]] || false
}
@test "commit: -f works correctly" {