Apply suggestions from code review

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
NixOS · Jul 20, 2020 · ac2fc7b · Ericson2314 · Jul 20, 2020 · Ericson2314
1 parent 68dfb8c
commit ac2fc7b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
@@ -234,7 +234,7 @@ ValidPathInfo Store::addToStoreSlow(std::string_view name, const Path & srcPath,
 
     TeeSink sinkIfNar { narHashSink, caHashSink };
 
-    /* We use the tee sink if we need to hash he nar twice */
+    /* We use the tee sink if we need to hash the nar twice */
     auto & sink = method == FileIngestionMethod::Recursive && hashAlgo != htSHA256
         ? static_cast<Sink &>(sinkIfNar)
         : narHashSink;
@@ -250,7 +250,11 @@ ValidPathInfo Store::addToStoreSlow(std::string_view name, const Path & srcPath,
         ? fileSink
         : blank;
 
-    parseDump(parseSink, tapped);
+    parseDump(
+        parseSink,
+        method == FileIngestionMethod::Recursive && hashAlgo == htSHA256
+            ? *fileSource // don't need to hash twice if we just can use the `narHash` twice
+            : tapped);
 
     auto [narHash, narSize] = narHashSink.finish();