view: Fix a reversion in 8.20200522 that broke entering or changing views.

Commit 2dc7b5186a586acb768744242083ad48d658a538 messed up indentation.

This commit was sponsored by Noam Kremen on Patreon.

diff --git a/Annex/View.hs b/Annex/View.hs
index 725cce3cb67b801bdceb403de2154b502040ac42..04481a4fd9f074b67dde29be39f10d1ce70ea63b 100644 (file)
--- a/Annex/View.hs
+++ b/Annex/View.hs
@@ -360,7 +360,7 @@ applyView' mkviewedfile getfilemetadata view = do
                        topf <- inRepo (toTopFilePath f)
                        go uh topf sha (toTreeItemType mode) =<< lookupKey f
                liftIO $ void clean
-               genViewBranch view
+       genViewBranch view
   where
        genviewedfiles = viewedFiles view mkviewedfile -- enables memoization
 

diff --git a/CHANGELOG b/CHANGELOG
index 97b43d90307aa21217a1991aa59857a6473bf423..7234d4c452c9891442269ad902df2154686942da 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ git-annex (8.20201008) UNRELEASED; urgency=medium
     backends. Make sure to relay any remaining stderr from the process,
     and potentially avoid the process getting a SIGPIPE if it writes to
     stderr too late. 
+  * view: Fix a reversion in 8.20200522 that broke entering or changing views.
 
  -- Joey Hess <id@joeyh.name>  Thu, 08 Oct 2020 10:48:17 -0400
 

diff --git a/doc/bugs/view.mdwn b/doc/bugs/view.mdwn
index 4dcbf82d586a0b561ab0785a878cf4ea01060a39..e1e44370cb1d0ed990ca44aadc5945443aa8e6e8 100644 (file)
--- a/doc/bugs/view.mdwn
+++ b/doc/bugs/view.mdwn
@@ -65,3 +65,7 @@ git-annex: view: 1 failed
 
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 git-annex is an awesome tool! Really appreciate your work and everything else works great!
+
+> Thank you for reporting, I've fixed this reversion and am also going to
+> add something like that to the test suite, which lacked any testing of
+> views. [[done]] --[[Joey]]