Fix kart lfs command

koordinates · Sep 5, 2022 · 6da7cc7 · 6da7cc7
1 parent 266dade
commit 6da7cc7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/kart/cli.py b/kart/cli.py
@@ -285,7 +285,7 @@ def lfs(ctx, args):
 
     repo = ctx.obj.get_repo(allowed_states=KartRepoState.ALL_STATES)
     kwargs = {"cwd": repo.workdir_path} if repo else {}
-    p = subprocess.run(["git-lfs", *args], **kwargs, env=tool_environment)
+    p = subprocess.run(["git-lfs", *args], **kwargs, env=tool_environment())
     sys.exit(p.returncode)
 
 

diff --git a/kart/json_diff_writers.py b/kart/json_diff_writers.py
@@ -275,8 +275,7 @@ def _calculate_and_feature_count_estimate(self):
             )
 
     def write_ds_diff(self, ds_path, ds_diff):
-        dataset = self.base_rs.datasets().get(ds_path)
-        dataset = dataset or self.target_rs.datasets().get(ds_path)
+        dataset = self._get_old_or_new_dataset(ds_path)
         schema_json_delta = ds_diff.recursive_get(["meta", "schema.json"])
 
         # The diffs generated by our datasets aren't explicit about datasets being added and removed.