From bfb98e9288d03a7c2cb78d0892a87939c6365c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Rowlands=20=28=EB=B3=80=EA=B8=B0=ED=98=B8=29?= Date: Mon, 24 Aug 2020 21:19:57 +0900 Subject: [PATCH] experiments: support binary and untracked files when generating (#4452) experiment patches --- dvc/repo/experiments/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dvc/repo/experiments/__init__.py b/dvc/repo/experiments/__init__.py index e4c056e17..8200812ee 100644 --- a/dvc/repo/experiments/__init__.py +++ b/dvc/repo/experiments/__init__.py @@ -182,7 +182,9 @@ class Experiments: # patch user's workspace into experiments clone tmp = tempfile.NamedTemporaryFile(delete=False).name try: - self.repo.scm.repo.git.diff(patch=True, output=tmp) + self.repo.scm.repo.git.diff( + patch=True, full_index=True, binary=True, output=tmp + ) if os.path.getsize(tmp): logger.debug("Patching experiment workspace") self.scm.repo.git.apply(tmp) @@ -504,12 +506,14 @@ class Experiments: self._scm_checkout(rev) tmp = tempfile.NamedTemporaryFile(delete=False).name - self.scm.repo.head.commit.diff("HEAD~1", patch=True, output=tmp) + self.scm.repo.head.commit.diff( + "HEAD~1", patch=True, full_index=True, binary=True, output=tmp + ) dirty = self.repo.scm.is_dirty() if dirty: logger.debug("Stashing workspace changes.") - self.repo.scm.repo.git.stash("push") + self.repo.scm.repo.git.stash("push", "--include-untracked") try: if os.path.getsize(tmp):