mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-09 18:59:12 -06:00
Code Issues Packages Projects Releases 127 Wiki Activity
9,643 Commits 106 Branches 597 Tags
c4ef6900859cd12b94bb67c96007eb114cbc5afe
Commit Graph

9643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Son
c4ef690085 go/go.mod: Bump fslock. 2021-08-06 11:11:55 -07:00
Zach Musgrave
46186fc874 Merge pull request #1979 from dolthub/zachmu-61499985 
[auto-bump] [no-release-notes] dependency by zachmu
 2021-08-05 20:04:31 -07:00
Brian Hendriks
0a0ce2181c Bh/gen cs (#1938) 2021-08-05 18:20:19 -07:00
zachmu
54efef5c16 [ga-bump-dep] Bump dependency in Dolt by zachmu 2021-08-05 19:54:01 +00:00
Zach Musgrave
6f5ea34185 Merge pull request #1976 from dolthub/zachmu/cleanup 
Cleanup from transaction migration
 2021-08-05 12:51:56 -07:00
Zach Musgrave
00624bcad9 Merge branch 'zachmu/cleanup' of github.com:dolthub/dolt into zachmu/cleanup 2021-08-05 12:51:35 -07:00
Zach Musgrave
bfe976375f PR feedback 2021-08-05 12:51:29 -07:00
Aaron Son
872c607010 Merge pull request #1978 from dolthub/aaron/value-store-sanity-check-gc 
[no-release-notes] go/store/types: value_store.go: Add some sanity checks on GC asserting that bufferedChunks is empty at beginning and end.
 2021-08-05 12:46:37 -07:00
zachmu
4a75e8bbd2 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2021-08-05 03:11:56 +00:00
Zach Musgrave
5b1aa2f3ef Merge branch 'zachmu/cleanup' of github.com:dolthub/dolt into zachmu/cleanup 2021-08-04 20:10:39 -07:00
Zach Musgrave
f8b2c234e5 Fix error in test 2021-08-04 20:10:33 -07:00
zachmu
73fb5281e3 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2021-08-05 02:18:31 +00:00
Zach Musgrave
55e094bef0 Removed PutTableToWorking 2021-08-04 19:17:21 -07:00
Aaron Son
a17dd95801 go/store/types/value_store_test.go: Fix test for new GC asserts. 2021-08-04 19:00:32 -07:00
Zach Musgrave
e67a480c86 Cleaned up docs staging code 2021-08-04 18:48:23 -07:00
Zach Musgrave
9499872e2e Removed unnecessary error recovery method and dolt_docs.go 2021-08-04 18:11:39 -07:00
Zach Musgrave
29565615fe Made StageAllTables functional 2021-08-04 17:50:34 -07:00
Aaron Son
b4d3820265 go/store/types: value_store.go: Add some sanity checks on GC asserting that bufferedChunks is empty at beginning and end. 2021-08-04 17:42:27 -07:00
Zach Musgrave
6971a52133 Removed intermediate environment updates from ResetSoft 2021-08-04 16:39:34 -07:00
Zach Musgrave
8e90789757 Merge branch 'zachmu/cleanup' of github.com:dolthub/dolt into zachmu/cleanup 2021-08-04 15:59:05 -07:00
Zach Musgrave
f60ee9ca0d Fix commit for active merge bug I introduced 2021-08-04 15:58:58 -07:00
Zach Musgrave
2c4b068f66 Cleared out the merge state in a few more places it was needed 2021-08-04 15:31:03 -07:00
zachmu
935143b19f [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2021-08-04 22:09:40 +00:00
Zach Musgrave
0a2521bdc8 Got rid of the final two misplaced methods on RepoStateReader 2021-08-04 15:08:15 -07:00
Zach Musgrave
45a891e221 Removed unused method 2021-08-04 10:10:50 -07:00
Zach Musgrave
75dd2a58c7 Merge branch 'master' into zachmu/cleanup 2021-08-04 09:58:07 -07:00
AndyA
fefabca3eb Merge pull request #1975 from dolthub/vinai/slight-bats-edit 
[no-release-notes] Vinai/slight bats edit
 2021-08-04 09:44:37 -07:00
andrew-wm-arthur
8de4ac62b1 [ga-bump-release] Update Dolt version to 0.27.2 and release v0.27.2 v0.27.2 2021-08-04 16:31:47 +00:00
Vinai Rachakonda
6a1c5ded21 nits 2021-08-03 18:19:26 -07:00
Vinai Rachakonda
e0405cd347 updt tests 2021-08-03 18:14:52 -07:00
Vinai Rachakonda
9d434dc57b Edit dolt merge ret type again (#1967) 2021-08-03 17:05:46 -07:00
AndyA
a51926d02e Merge pull request #1972 from dolthub/andy/merge-abort-clean-index 
Reset staging index on `dolt merge --abort`
 2021-08-03 15:48:27 -07:00
Zach Musgrave
205dffece0 Merge pull request #1965 from dolthub/zachmu/panic-at-the-merge-disco 
Fixed panic when merging a branch that still contains a table that was deleted in the target
 2021-08-03 15:29:39 -07:00
Andy Arthur
d18c2e8003 set stagedRoot = workingRoot in WorkingSet.AbortMerge() 2021-08-03 15:19:10 -07:00
Andy Arthur
f6c9f227cb added skipped bats to repro dirty index after 'dolt merge --abort' 2021-08-03 15:14:54 -07:00
Zach Musgrave
6667a78ed7 PR feedback 2021-08-03 15:05:57 -07:00
Zach Musgrave
3a674eee6d Moved a function 2021-08-02 17:34:39 -07:00
Zach Musgrave
1ab4f68db6 Slightly more robust test 2021-08-02 17:31:33 -07:00
Zach Musgrave
677b7d5cd7 Fixed panic in merging a branch that still contains a table that was deleted in our root 2021-08-02 17:25:35 -07:00
Zach Musgrave
9ce9d5e0b4 More tests, and fixed most of the deleted table problems in merge 2021-08-02 17:14:29 -07:00
Zach Musgrave
cbabc4a136 Refactoring merge table method for readability 2021-08-02 15:29:56 -07:00
Brian Hendriks
76212aae15 expose commit parent refs (#1963) 
* expose commit parent refs

* no need for ctx

* adding commentt
 2021-08-02 14:48:59 -07:00
Zach Musgrave
c794bf0103 Fixed some documentation typos 2021-08-02 14:14:07 -07:00
Zach Musgrave
6c55b14ecb New merge tests, including two panics 2021-08-02 14:07:23 -07:00
AndyA
c5efbd8d3e Merge pull request #1960 from dolthub/andy/closure-common-ancestor 
Find common ancestor using transitive ref closure
 2021-08-02 08:59:49 -07:00
Andy Arthur
98255f6797 fix copyright header 2021-08-02 08:40:39 -07:00
Andy Arthur
9cdfc0e639 doc comments 2021-08-01 20:22:40 -07:00
Andy Arthur
4344cc7c93 fix private return type 2021-07-31 11:37:26 -07:00
Andy Arthur
3ebf3cd1f9 fix typo 2021-07-31 11:34:57 -07:00
Andy Arthur
61d09f56a9 added lazy ref closure 2021-07-31 11:15:31 -07:00