mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-26 02:58:44 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity
22,822 Commits 74 Branches 593 Tags
e94ffebb29c4fcd09422ff086488d640fc2fcfd3
Commit Graph

22822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stephanie
e94ffebb29 Merge pull request #7373 from dolthub/steph/rebase 
add `dolt rebase` command
 2024-01-23 10:27:58 -08:00
Dustin Brown
12c0ef0204 Update nightly-performance-benchmarks-email-report.yaml 2024-01-23 09:54:07 -08:00
Dustin Brown
38f0e1c60d [ga-bump-dep] Bump dependency in Dolt by max-hoffman (#7394) 
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com>
 2024-01-22 20:46:41 -08:00
Stephanie You
89c8e806a9 Merge remote-tracking branch 'origin/main' into steph/rebase 2024-01-22 17:21:33 -08:00
Stephanie You
b3d5705ac9 failed rebase aborts and cleans up 2024-01-22 15:21:36 -08:00
Stephanie You
d94f840c92 PR comments 2024-01-22 14:39:52 -08:00
macneale4
db6a5d08da [ga-bump-release] Update Dolt version to 1.32.1 and release v1.32.1 v1.32.1 2024-01-22 21:38:36 +00:00
Aaron Son
777ae43170 Merge pull request #7389 from dolthub/aaron/remotesrv-bats-no-running-in-parent-dir-fix 
[no-release-notes] integration-tests/bats: Ensure we do not run `dolt` from a parent directory of the remotesrv dir.
 2024-01-22 13:35:23 -08:00
Neil Macneale IV
15bd713026 Merge pull request #7386 from dolthub/macneale4/clean-clone 
Clean up unnecessary references when cloning

Fixes: https://github.com/dolthub/dolt/issues/7043
 2024-01-22 13:18:09 -08:00
Aaron Son
48be2c48fe [no-release-notes] integration-tests/bats: Ensure we do not run dolt from a parent directory of the remotesrv dir. 
Doing so can cause `dolt` to open the remotesrv database as a DoltDB, which may
race with remotesrv opening it and may cause it to appear to read-only in the
remotesrv process.
 2024-01-22 12:14:50 -08:00
Neil Macneale IV
5fb69ebc1a PR Feedback 2024-01-22 11:07:36 -08:00
Neil Macneale IV
427b04b733 Update go/libraries/doltcore/env/actions/clone.go 
Co-authored-by: Aaron Son <aaron@dolthub.com>
 2024-01-22 11:00:38 -08:00
Neil Macneale IV
006fbdfce6 Add a bats test to ensure we don't clone remote branches repeatedly 2024-01-22 10:00:50 -08:00
Neil Macneale IV
e2721cfb94 Be more selective in our remote references when cloning another repo 2024-01-22 10:00:50 -08:00
Maximilian Hoffman
6b41096d81 Write stats to disk and dolt_statistics table (#7243) 
* Write statistics to prolly tree

* fix go-sql-server-driver

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* bump

* [skip actions] [ga-update-correctness] SQL Correctness updated to 99.997709

* Tidy

* test edits

* fix string outputs

* fix string printing histogram rows

* bump

* [skip actions] [ga-update-correctness] SQL Correctness updated to 99.998097

* test bump

* bump

* bump

---------

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
Co-authored-by: coffeegoddd <coffeegoddd@users.noreply.github.com>
 2024-01-20 11:49:45 -08:00
Zach Musgrave
dee5e41a5a Merge pull request #7379 from dolthub/zachmu/replicate-tags 
[no-release-notes] simplified warn on error behavior
 2024-01-19 18:01:37 -08:00
zachmu
da1bb8df16 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2024-01-20 01:42:11 +00:00
Zach Musgrave
f5df9852a0 Merge branch 'zachmu/replicate-tags' of github.com:dolthub/dolt into zachmu/replicate-tags 2024-01-19 17:33:39 -08:00
Zach Musgrave
0d27120afd Added test for deleting tags 2024-01-19 17:29:42 -08:00
Zach Musgrave
91b953277c Simplified warn on error behavior for replication 2024-01-19 17:06:47 -08:00
Zach Musgrave
b981bef03d Merge pull request #7377 from dolthub/zachmu/replicate-tags 
Push tags on remote replication
 2024-01-19 16:54:12 -08:00
zachmu
3ea7acb6cd [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2024-01-20 00:08:19 +00:00
Zach Musgrave
fbbdc3cc6d Push tags on replication 2024-01-19 15:55:25 -08:00
Stephanie You
a8f58bdb2a skip remote rebase bats tests 2024-01-19 00:38:43 -08:00
Stephanie You
252b373d3a minor fixes 2024-01-19 00:33:42 -08:00
stephkyou
c784959efe [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2024-01-19 08:17:04 +00:00
Stephanie You
78d763ddfa rebase remote test 2024-01-19 00:01:58 -08:00
Stephanie You
073880cd9d add rebase command 2024-01-18 23:29:48 -08:00
Stephanie You
a3ea0aa803 rename open temp editor function to be more general 2024-01-18 23:11:48 -08:00
Stephanie You
c9947149f1 add rebase event 2024-01-18 23:10:19 -08:00
Stephanie You
b496674422 rebase bats tests 2024-01-18 23:09:15 -08:00
macneale4
9360c4e199 [ga-bump-release] Update Dolt version to 1.32.0 and release v1.32.0 v1.32.0 2024-01-19 01:34:08 +00:00
Dustin Brown
bbcfa555cc [ga-bump-dep] Bump dependency in Dolt by max-hoffman (#7369) 2024-01-18 17:23:49 -08:00
Neil Macneale IV
dc3c0eaf4f Merge pull request #7363 from dolthub/macneale4/merge-noop-fix 
dolt_merge() operation now appropriately ends as a no-op when an attempt is made to merge in a commit which is already reachable from HEAD. This matches git behavior, and is a non-error scenario.

In order to communicate to users what actually happened, the message column was added to the output of dolt_merge() and dolt_pull() stored procedures. Given the change in schema and that some user may actually depend on this broken merge behavior, this is a breaking change.
 2024-01-18 16:10:29 -08:00
jennifersp
20b42aafdf update sqllogictest/go version (#7366) 2024-01-18 15:59:09 -08:00
macneale4
65d411e34c [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2024-01-18 22:08:01 +00:00
Neil Macneale IV
d8bd592db9 PR feedback 2024-01-18 14:00:35 -08:00
Zach Musgrave
3cbb73cafa Merge pull request #7357 from dolthub/zachmu/prepare2 
[no-release-notes] refactoring BinaryExpression
 2024-01-18 13:49:00 -08:00
Zach Musgrave
9c1ee17361 Merge branch 'zachmu/prepare2' of github.com:dolthub/dolt into zachmu/prepare2 2024-01-18 13:42:10 -08:00
Zach Musgrave
929d7b2735 Latest gms 2024-01-18 13:42:03 -08:00
Dustin Brown
edde46c33f Merge pull request #7364 from dolthub/db/fix 
[no-release-notes] /.github/workflows/pull-report.yaml: check as bool
 2024-01-18 13:41:54 -08:00
coffeegoddd
e29df02040 /.github/workflows/pull-report.yaml: check as bool 2024-01-18 13:41:02 -08:00
Neil Macneale IV
fb440bacf3 Fix result expectations in mysql-client-tests 2024-01-18 13:36:17 -08:00
macneale4
476dfd781a [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2024-01-18 21:28:23 +00:00
Neil Macneale IV
329cf5ebbc Update go/cmd/dolt/commands/pull.go 
Co-authored-by: Jason Fulghum <jason@dolthub.com>
 2024-01-18 13:21:11 -08:00
zachmu
cb5379fc58 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2024-01-18 20:40:08 +00:00
Zach Musgrave
030ddc2982 Fix compile error 2024-01-18 12:33:16 -08:00
Neil Macneale IV
6a1389437b fix typo 2024-01-18 12:26:51 -08:00
Zach Musgrave
241ee215ac dev gms for testing 2024-01-18 12:21:02 -08:00
Neil Macneale IV
3d5a43ced3 Remove the incorrect validation in constraints test 2024-01-18 12:20:30 -08:00