Commit Graph

114 Commits

Author SHA1 Message Date
Neil Macneale IV 9f85c88c5c Fix two tests which depended on broken behavior 2024-02-01 15:00:09 -08:00
Neil Macneale IV 0b822a16f5 Missed a || false 2024-02-01 15:00:09 -08:00
Neil Macneale IV f147d60947 Ignore the local tracking branch when pushing 2024-02-01 15:00:09 -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
Stephanie You 4ec6d2b9fe PR comments 2023-12-04 10:00:58 -08:00
Stephanie You be31b2852e adds --single-branch for dolt clone 2023-12-01 15:29:01 -08:00
jennifersp 8ea2847759 allow hyphen in db name to match its dir name (#6995) 2023-11-16 07:25:55 -08:00
jennifersp c107df2bc2 add --all flag for dolt push (#6787) 2023-10-14 12:36:25 -07:00
Stephanie You 871fab1546 update bats tests 2023-10-13 01:12:59 -07:00
Stephanie You 942d9dfd31 up to date error returns 0 status code 2023-09-29 15:10:38 -07:00
Stephanie You f772f4d003 fix bats tests 2023-09-29 15:10:38 -07:00
Zach Musgrave c3c3f41c6d Tests of fetch and pull, and moved common test methods into common file 2023-09-26 12:00:00 -07:00
stephanie 41bddf21e3 Merge pull request #6652 from dolthub/steph/fetch
migrates fetch to use sql queries
2023-09-15 17:56:53 -07:00
Stephanie You ad4a66ad1a more fetch output bats fixes 2023-09-15 12:52:59 -07:00
Stephanie You ae27cd3cd8 update bats tests for fetch output 2023-09-15 10:00:28 -07:00
Zach Musgrave 3c3db5cb7a Making sure divergent head pulls aren't a fast-forward 2023-09-11 17:35:15 -07:00
Zach Musgrave d8ad69ea61 Dolt_pull() behavior and bats test 2023-09-11 16:59:44 -07:00
Zach Musgrave c398225c62 Bats tests for merging remote tracking branch 2023-09-11 16:33:06 -07:00
Jason Fulghum 4773192a50 Fixing missing "|| false" in BATS files 2023-08-09 12:10:14 -07:00
Zach Musgrave 51e20d778d Bug fix and tests for specifying --prune with a refspec 2023-08-02 12:07:06 -07:00
Zach Musgrave 97e8adc5dc Support for dolt_fetch procedure 2023-08-01 17:22:40 -07:00
Zach Musgrave c4a2ff05aa Bats test for --prune 2023-08-01 17:15:14 -07:00
Stephanie You ea418cda38 dolt merge doesn't fail if unable to get hash 2023-07-19 23:28:12 -07:00
Stephanie You af1a8b5ad2 Merge branch 'main' into steph/dolt-merge 2023-07-17 15:04:04 -07:00
Nick Tobey 5fa670c257 Update bats test to use new error message. 2023-04-18 11:50:49 -07:00
jennifersp a88828d921 support staged set of changes for dolt stash (#5502) 2023-03-08 14:20:25 -08:00
Andy Arthur 038945d95f integration-test/bats: more file remotes bats fixes 2023-03-07 08:19:32 -08:00
Stephanie You 950a096b66 add bats tests for call dolt_checkout --track 2023-02-13 15:38:49 -08:00
Stephanie You 725d15737e fix --track for dolt_checkout 2023-02-13 13:48:27 -08:00
jennifersp f3f68b35c2 add --track flag for dolt_branch() procedure (#5312) 2023-02-06 14:37:25 -08:00
Stephanie You fd0e4d6faa makes -f default behavior for dolt fetch 2023-02-03 16:07:19 -08:00
jennifersp 257b6b25fc allow different format options for dolt branch with track flag (#5286) 2023-02-03 09:34:40 -08:00
Stephanie You 5c9f2957a2 check output in test when dolt pull without configs 2023-01-24 14:30:10 -08:00
Stephanie You a5320f6cea dolt pull without configs doesnt return error when up to date 2023-01-24 14:01:17 -08:00
Daylon Wilkins 8aeb1c659e Removed deprecated dolt functions 2023-01-03 02:13:37 -08:00
jennifersp d88393713e support push.autoSetupRemote config variable (#4937) 2022-12-07 10:49:15 -08:00
Andy Arthur 45bc3c1e16 update bats tests 2022-11-08 17:21:02 -08:00
Tan Yong Zhi 5e8ffeae98 Should be the last of them 2022-08-26 12:14:05 +08:00
Tan Yong Zhi 9b4b805268 Fix more failing bats tests 2022-08-26 12:14:05 +08:00
jennifersp 6886a8721f commit merge if no conflict (#4105) 2022-08-23 12:38:12 -07:00
jennifersp c135e3eefb set upstream from sql session (#4151) 2022-08-22 22:27:26 -07:00
Jason Fulghum 132fbc7742 Merge pull request #4001 from dolthub/fulghum/dolt_clone
Fixing `dolt_clone` stored procedure to clean up partially cloned database directories on failure
2022-08-03 16:56:55 -07:00
Jason Fulghum 525f7e2d14 Adding one more test to ensure an existing database doesn't get deleted after an attempt to clone a database with the same name fails. 2022-08-02 17:50:55 -07:00
Jason Fulghum bcc4432ef4 Fixing dolt_clone stored procedure to clean up any partially cloned database directories if a clone fails. 2022-08-02 17:45:51 -07:00
Jason Fulghum f3f3fcca83 Adding new BATS test to repro the bug with dolt_remote writing to the wrong directory in a multi repo env. 2022-08-02 11:25:12 -07:00
Jason Fulghum 3c8f4426bb Adding more test cases for SQL and command line dolt pull to test out cases with working set and commit conflicts. 2022-07-29 18:34:34 -07:00
Jason Fulghum f4faefeed8 Adding a test for 'dolt pull <remote> <remoteBranch>' with an invalid remote branch 2022-07-28 13:31:16 -07:00
Jason Fulghum 97514793d0 New BATS test for dolt pull <remote> <remoteBranch> form on command line 2022-07-28 13:12:00 -07:00
Jason Fulghum caefe9ec41 Merge branch 'main' into zachmu/clone 2022-07-20 15:56:05 -07:00
jennifersp bfc3cfbda0 Support dolt_remote() stored procedure (#3862) 2022-07-20 14:46:28 -07:00