Do not use checkouts with explicit revision in job ID

1 files changed, 11 insertions, 4 deletions

diff --git a/src/Eval.hs b/src/Eval.hs
index 71c9b9f..572dad2 100644
--- a/src/Eval.hs
+++ b/src/Eval.hs
@@ -114,7 +114,10 @@ evalJob revisionOverrides dset decl = do
             Just dest -> return $ dpublish { jpDestination = dest }
             Nothing -> throwError $ OtherEvalError $ "no url defined for destination ‘" <> textDestinationName (jpDestination dpublish) <> "’"
 
-    let otherRepoIds = map (\( repo, ( subtree, tree )) -> JobIdTree (fst <$> repo) subtree (treeId tree)) otherRepoTrees
+    let otherRepoIds = flip mapMaybe otherRepoTrees $ \case
+            ( repo, ( subtree, tree )) -> do
+                guard $ maybe True (isNothing . snd) repo -- use only checkouts without explicit revision in job id
+                Just $ JobIdTree (fst <$> repo) subtree (treeId tree)
     return
         ( Job
             { jobId = JobId $ reverse $ reverse otherRepoIds ++ JobIdName (jobId decl) : eiCurrentIdRev
@@ -166,9 +169,13 @@ canonicalJobName (r : rs) config mbDefaultRepo = do
         Just djob -> do
             otherRepos <- collectOtherRepos dset djob
             ( overrides, rs' ) <- (\f -> foldM f ( [], rs ) otherRepos) $
-                \( overrides, crs ) ( mbrepo, path ) -> do
-                    ( tree, crs' ) <- readTreeFromIdRef crs path =<< evalRepo (fst <$> mbrepo)
-                    return ( ( fst <$> mbrepo, tree ) : overrides, crs' )
+                \( overrides, crs ) ( mbrepo, path ) -> if
+                    | Just ( _, Just _ ) <- mbrepo -> do
+                        -- use only checkouts without explicit revision in job id
+                        return ( overrides, crs )
+                    | otherwise -> do
+                        ( tree, crs' ) <- readTreeFromIdRef crs path =<< evalRepo (fst <$> mbrepo)
+                        return ( ( fst <$> mbrepo, tree ) : overrides, crs' )
             case rs' of
                 (r' : _) -> throwError $ OtherEvalError $ "unexpected job ref part ‘" <> r' <> "’"
                 _ -> return ()