Skip to content

Commit

Permalink
push: handle missing/failed version_aware file
Browse files Browse the repository at this point in the history
Previously we used recorded index which had stub entries
for missing/failed outputs, but now we actually collect
everything ourselves and those are missing.
  • Loading branch information
efiop committed Nov 28, 2023
1 parent 1e9b60d commit ffa630e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions dvc/repo/worktree.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def _get_remote(
return repo.cloud.get_remote(name, command)


def _merge_push_meta(
def _merge_push_meta( # noqa: C901
out: "Output",
index: Union["DataIndex", "DataIndexView"],
remote: Optional[str] = None,
Expand All @@ -116,7 +116,11 @@ def _merge_push_meta(
from dvc_data.index.save import build_tree

_, key = out.index_key
entry = index[key]

entry = index.get(key)
if entry is None:
return

repo = out.stage.repo
if out.isdir():
old_tree = out.get_obj()
Expand Down

0 comments on commit ffa630e

Please sign in to comment.