mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-12 18:59:03 -06:00
Code Issues Packages Projects Releases 129 Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Stephanie You
2024-01-19 00:33:42 -08:00
parent c784959efe
commit 252b373d3a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/cmd/dolt/commands/rebase.go
View File

@@ -325,7 +325,7 @@ func getRebaseAction(col interface{}) (string, bool) {
if ok {
return action, true
} else {
return dprocedures.RebaseActionEnumType.At(int(col.(uint16) - 1))
return dprocedures.RebaseActionEnumType.At(int(col.(uint16)))
}
}

9
integration-tests/bats/rebase.bats
View File

@@ -129,7 +129,7 @@ teardown() {
run dolt log
[ "$status" -eq 0 ]
[[ "$output" =~ "main commit 2" ]]
[[ "$output" =~ "main commit 2" ]] || false
}
@test "rebase: invalid rebase plan" {
@@ -328,6 +328,11 @@ teardown() {
dolt sql -q "insert into t2 values (1);"
dolt commit -am "b1 commit 2"
dolt checkout main
dolt sql -q "insert into t1 values (2,2);"
dolt commit -am "main commit 3"
dolt checkout b1
run dolt rebase -i main
[ "$status" -eq 0 ]
[[ "$output" =~ "Successfully rebased and updated refs/heads/b1" ]] || false
@@ -336,7 +341,7 @@ teardown() {
[ "$status" -eq 0 ]
[[ "$output" =~ "b1 commit 2" ]] || false
[[ "$output" =~ "b1 commit 1" ]] || false
[[ "$output" =~ "main commit 1" ]] || false
[[ "$output" =~ "main commit 3" ]] || false
! [[ "$output" =~ "b1 merge commit" ]] || false
}