From ce8e83897bc09f64b0523328e61b86902aa015ef Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 31 Jul 2020 14:05:43 -0700 Subject: pre-upload: use first-parent diff for list of affected files Otherwise, trying to upload a merge can fail with errors like ValueError: Failed to parse diff output: ::100644 100644 100644 4d2b33a 4d2b33a d63fea7 MM BUILD because "git diff ^!" returns a diff against all parents that DIFF_RE does not know how to parse. Reported-by: Matthew Maurer Change-Id: Iafd846f083c0c078b383f7d48ad00cce896a404c --- rh/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rh/git.py b/rh/git.py index 282b1e2..ab87039 100644 --- a/rh/git.py +++ b/rh/git.py @@ -167,7 +167,7 @@ def get_affected_files(commit): Returns: A list of modified/added (and perhaps deleted) files """ - return raw_diff(os.getcwd(), '%s^!' % commit) + return raw_diff(os.getcwd(), '%s^-' % commit) def get_commits(ignore_merged_commits=False): -- cgit v1.2.3