diff --git a/.gitignore b/.gitignore index ec9fe981cd..aff810381c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ .stack-root/ /.cabal-sandbox/ TAGS -/Setup/ +/Setup cabal-dev/ cabal.sandbox.config dist/ diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs index 15a5d5b441..4bf2d8496e 100644 --- a/etc/scripts/release.hs +++ b/etc/scripts/release.hs @@ -242,7 +242,7 @@ rules global@Global{..} args = do unless gUploadOnly $ releaseDir binaryExeFileName %> \out -> do need [releaseBinDir binaryName stackExeFileName] (Stdout versionOut) <- cmd (releaseBinDir binaryName stackExeFileName) "--version" - () <- cmd "git diff" + -- () <- cmd "git diff" when (not gAllowDirty && "dirty" `isInfixOf` lower versionOut) $ error ("Refusing continue because 'stack --version' reports dirty. Use --" ++ allowDirtyOptName ++ " option to continue anyway.")