diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-08 22:37:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-08 22:37:11 -0400 |
| commit | 386281202d5cb526d1b35022b3709b1f1064f68e (patch) | |
| tree | 7dcea4e59765d4e1bb76ca23b864befc4546068a /src/wrapper.hs | |
| parent | b38cedc0a81085dd5e4267866d1f460054d9c50d (diff) | |
| parent | d7a9157e7e1e8f447864d9d0cdd20ed1839fc23c (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/wrapper.hs')
| -rw-r--r-- | src/wrapper.hs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs index a73ed969..e367fe69 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -74,7 +74,13 @@ wrapper args propellordir propellorbin = do fetchUpstreamBranch propellordir distrepo changeWorkingDirectory propellordir void $ boolSystem "git" [Param "remote", Param "rm", Param "origin"] - , void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir] + , do + void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir] + changeWorkingDirectory propellordir + -- Rename origin to upstream and avoid + -- git push to that read-only repo. + void $ boolSystem "git" [Param "remote", Param "rename", Param "origin", Param "upstream"] + void $ boolSystem "git" [Param "config", Param "--unset", Param "branch.master.remote", Param "upstream"] ) checkRepo = whenM (doesFileExist disthead <&&> doesFileExist (propellordir </> "propellor.cabal")) $ do |