Formats repo
This commit is contained in:
+2
-3
@@ -12,7 +12,6 @@ import TestHelper
|
||||
spec :: Spec
|
||||
spec = do
|
||||
describe "gitPull" $ do
|
||||
|
||||
it "pulls changes from remote 'origin'" $ do
|
||||
withTempGitRepoWithRemote $ \local -> do
|
||||
-- Make a second commit on local and push to remote
|
||||
@@ -27,7 +26,7 @@ spec = do
|
||||
countBefore <- commitCount local
|
||||
countBefore `shouldBe` 1
|
||||
|
||||
let cfg = defaultRepoConfig {rcPath = local}
|
||||
let cfg = defaultRepoConfig{rcPath = local}
|
||||
(code, _, _) <- gitPull cfg
|
||||
code `shouldBe` ExitSuccess
|
||||
|
||||
@@ -73,7 +72,7 @@ spec = do
|
||||
|
||||
-- Pull with --rebase: local commits are rebased on top
|
||||
-- of the fetched remote commit, yielding a linear history.
|
||||
let cfg = defaultRepoConfig {rcPath = localDir}
|
||||
let cfg = defaultRepoConfig{rcPath = localDir}
|
||||
(code, _, _) <- gitPull cfg
|
||||
code `shouldBe` ExitSuccess
|
||||
-- Rebase produces linear history: 3 commits, no merge commit
|
||||
|
||||
Reference in New Issue
Block a user