From a20a4af62aee6f338f81cd16e988bea3878adf59 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 31 Oct 2021 10:55:37 +0100 Subject: [PATCH] maintainers/scripts/update.nix: Support committing with nix-update-script When updating a package using nix-update-script with `--argstr commit true`, update.nix would not detect the changes because nix-update would stage them and `git diff` would be empty. We now detect both staged and unstaged changes to handle this use case. --- maintainers/scripts/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index eb26a472e926..06b12a0ee04e 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -114,7 +114,7 @@ async def check_changes(package: Dict, worktree: str, update_info: str): changes[0]['newVersion'] = json.loads((await obtain_new_version_process.stdout.read()).decode('utf-8')) if 'files' not in changes[0]: - changed_files_process = await check_subprocess('git', 'diff', '--name-only', stdout=asyncio.subprocess.PIPE, cwd=worktree) + changed_files_process = await check_subprocess('git', 'diff', '--name-only', 'HEAD', stdout=asyncio.subprocess.PIPE, cwd=worktree) changed_files = (await changed_files_process.stdout.read()).splitlines() changes[0]['files'] = changed_files