From 935888e31749dea0425bb373248c8fcef8b540c1 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 15 Aug 2016 16:24:17 -0400 Subject: [PATCH] ignore whitespace when diffing requirements files For releases we don't care if there are whitespace changes in the requirements file, so ignore them to make it easier to identify new or changed requirements. Change-Id: Ibb7798c833dfa0f6725a15de99f1f1c2bbd37c02 Signed-off-by: Doug Hellmann --- openstack_releases/cmds/list_changes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openstack_releases/cmds/list_changes.py b/openstack_releases/cmds/list_changes.py index c511e1b5b9..0b377ab7cb 100644 --- a/openstack_releases/cmds/list_changes.py +++ b/openstack_releases/cmds/list_changes.py @@ -74,7 +74,11 @@ def git_diff(workdir, repo, git_range, file_pattern): file_pattern))) if files: header('Requirements Changes %s' % git_range) - cmd = ['git', 'diff', '-U0', '--no-color', git_range] + cmd = [ + 'git', 'diff', '-U0', '--no-color', + '--ignore-space-change', '--ignore-blank-lines', + git_range, + ] cmd.extend(f[len(repo_dir) + 1:] for f in files) subprocess.check_call(cmd, cwd=repo_dir) print()