diff --git a/Annex/View.hs b/Annex/View.hs index ce4a9d96f7..57778ff67b 100644 --- a/Annex/View.hs +++ b/Annex/View.hs @@ -489,8 +489,8 @@ applyView'' mkviewedfile getfilemetadata view l clean conv = do getmetadata gc mdfeeder mdcloser ts process uh mdreader = liftIO mdreader >>= \case - Just ((topf, _, _, Just k), Just mdlog) -> do - let metadata = parseCurrentMetaData mdlog + Just ((topf, _, _, Just k), mdlog) -> do + let metadata = maybe emptyMetaData parseCurrentMetaData mdlog let f = fromRawFilePath $ getTopFilePath topf let metadata' = getfilemetadata f `unionMetaData` metadata forM_ (genviewedfiles f metadata') $ \fv -> do diff --git a/CHANGELOG b/CHANGELOG index 8dd31cfa0f..db9963e387 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,8 @@ git-annex (10.20230215) UNRELEASED; urgency=medium * Fix more breakage caused by git's fix for CVE-2022-24765, this time involving a remote that is a local bare repository not owned by the current user. + * view: Fix a reversion in 10.20230214 that omitted a file from a view + when the file had no metadata set, but the view only used path fields. * stack.yaml: Update to lts-19.33 and aws-0.24 -- Joey Hess Tue, 14 Feb 2023 14:11:11 -0400 diff --git a/doc/todo/explicit_metadata_needed_for_view_inclusion_or_not.mdwn b/doc/todo/explicit_metadata_needed_for_view_inclusion_or_not.mdwn index c3b5d5e5f9..6ec6332a4a 100644 --- a/doc/todo/explicit_metadata_needed_for_view_inclusion_or_not.mdwn +++ b/doc/todo/explicit_metadata_needed_for_view_inclusion_or_not.mdwn @@ -113,3 +113,4 @@ Mode LastWriteTime Length Name [[!meta author=jkniiv]] +> [[fixed|done]] --[[Joey]] diff --git a/doc/todo/explicit_metadata_needed_for_view_inclusion_or_not/comment_1_17f8adc8555ea0a2716308e3f5188a25._comment b/doc/todo/explicit_metadata_needed_for_view_inclusion_or_not/comment_1_17f8adc8555ea0a2716308e3f5188a25._comment new file mode 100644 index 0000000000..00d42ef5a6 --- /dev/null +++ b/doc/todo/explicit_metadata_needed_for_view_inclusion_or_not/comment_1_17f8adc8555ea0a2716308e3f5188a25._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2023-02-16T18:55:06Z" + content=""" +I'm surprised by this behavior change! (And I replicated it on linux, no +apologies necessary for also testing Windows support..) + +[[!commit 826b225ca81d469640e51628865dbd64a1d37773]] is the buggy commit. +When there is no metadata log, it accidentially skips calling +getfilemetadata. + +I've fixed that. I wonder if I should push up the shedule of the next +release because of this reversion? Currently I'm inclined to treat it as +medium urgency for release (1-2 weeks). +"""]]