Merge remote-tracking branch 'origin/master' into substitute-other-storedir

1 files changed, 2 insertions, 9 deletions

diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index 48a4722ae..e183cb8b5 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -53,18 +53,11 @@ struct CmdAddToStore : MixDryRun, StoreCommand
 
         auto narHash = hashString(htSHA256, *sink.s);
 
-        Hash hash;
-        switch (ingestionMethod) {
-        case FileIngestionMethod::Recursive: {
-            hash = narHash;
-            break;
-        }
-        case FileIngestionMethod::Flat: {
+        Hash hash = narHash;
+        if (ingestionMethod == FileIngestionMethod::Flat) {
             HashSink hsink(htSHA256);
             readFile(path, hsink);
             hash = hsink.finish().first;
-            break;
-        }
         }
 
         ValidPathInfo info(store->makeFixedOutputPath(ingestionMethod, hash, *namePart));