diff --git a/main.py b/main.py index 53169f0..b2a3eca 100644 --- a/main.py +++ b/main.py @@ -368,8 +368,8 @@ def update(): repo.git.merge('-Xtheirs', '--allow-unrelated-histories', '--no=commit', 'origin/master') except Exception: repo.git.merge('--autostash', '--allow-unrelated-histories', '--no-commit', 'origin/master') - repo.git.reset('$(git diff --name-only') - repo.git.restore('$(git diff --name-only') + repo.git.reset('$(git diff --name-only)') + repo.git.restore('$(git diff --name-only)') repo.git.stash('drop') canvas.itemconfig(progress, text="") canvas.itemconfig('progress', state='hidden')