summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorSean Whitton2019-04-22 12:36:30 -0700
committerJoey Hess2019-04-22 16:39:06 -0400
commit32c1e68cfcef57d86fbf8c19743494ee4b9f1a4f (patch)
tree5357cc74d6352ec8f951bd0e302d48c28c230ce6 /src/Propellor
parent73ae7e6ea5b483a3eaf72ed50918694c2b9a9642 (diff)
fix Git.pulled always reporting a change
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Git.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Git.hs b/src/Propellor/Property/Git.hs
index e7dcb80c..a0ed4f02 100644
--- a/src/Propellor/Property/Git.hs
+++ b/src/Propellor/Property/Git.hs
@@ -110,7 +110,7 @@ pulled owner url dir mbranch = go
[ "cd " ++ shellEscape dir
, "git pull"
]
- `changesFile` (dir </> ".git" </> "FETCH_HEAD")
+ `changesFileContent` (dir </> ".git" </> "FETCH_HEAD")
isGitDir :: FilePath -> IO Bool
isGitDir dir = isNothing <$> catchMaybeIO (readProcess "git" ["rev-parse", "--resolve-git-dir", dir])