on master help sign in
Fix errors so they can be turned into warnings. And fix layers

cli-app was beginning to learn too much about obelisk layers

commit85ebe10aa587be18450a4d9b69e666374133b0f0 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateWed 17 Oct 2018, 17:51 (8 years ago) parenta0cfbc7
1 file changed+5−5
lib/command/src/Obelisk/Command/Thunk.hs+5−5
lib/command/src/Obelisk/Command/Thunk.hs+5−5
@@ -662,8 +662,8 @@ getThunkPtr' checkClean thunkDir = do
662662 let untrackedBranches = Map.keys errorMap
663663 when (not $ L.null untrackedBranches) $ failWith $ T.unlines $
664664 [ "thunk pack: Certain branches in the thunk have no upstream branch \
665− \ set. This means don't know to check whether all your work is \
666− \ saved. The offending branches are:"
665+ \set. This means don't know to check whether all your work is \
666+ \saved. The offending branches are:"
667667 , ""
668668 , T.unwords untrackedBranches
669669 , ""
@@ -673,8 +673,8 @@ getThunkPtr' checkClean thunkDir = do
673673 ((\branch -> "git push -u origin " <> branch) <$> untrackedBranches) ++
674674 [ ""
675675 , "These will push the branches to the default remote under the same \
676− \ name, and (thanks to the `-u`) remember that choice so you don't \
677− \ get this error again."
676+ \name, and (thanks to the `-u`) remember that choice so you don't \
677+ \get this error again."
678678 ]
679679
680680 -- loosely by https://stackoverflow.com/questions/7773939/show-git-ahead-and-behind-info-for-all-branches-including-remotes
@@ -699,7 +699,7 @@ getThunkPtr' checkClean thunkDir = do
699699 [" ", branch, " ahead: ", T.pack (show ahead), " behind: ", T.pack (show behind), " remote branch ", upstream]) ++
700700 [ ""
701701 , "Please push these upstream and try again. (Or just fetch, if they are somehow \
702− \ pushed but this repo's remote tracking branches don't know it.)"
702+ \pushed but this repo's remote tracking branches don't know it.)"
703703 ]
704704
705705 -- We assume it's safe to pack the thunk at this point