| Index: upload.py |
| =================================================================== |
| --- a/upload.py |
| +++ b/upload.py |
| @@ -1612,16 +1612,17 @@ |
| del env["GIT_EXTERNAL_DIFF"] |
| # -M/-C will not print the diff for the deleted file when a file is renamed. |
| # This is confusing because the original file will not be shown on the |
| # review when a file is renamed. So, get a diff with ONLY deletes, then |
| # append a diff (with rename detection), without deletes. |
| cmd = [ |
| "git", "diff", "--no-color", "--no-ext-diff", "--full-index", |
| "--ignore-submodules", "--src-prefix=a/", "--dst-prefix=b/", |
| + "--binary", |
| ] |
| diff = RunShell( |
| cmd + ["--no-renames", "--diff-filter=D"] + extra_args, |
| env=env, silent_ok=True) |
| assert 0 <= self.options.git_similarity <= 100 |
| if self.options.git_find_copies: |
| similarity_options = ["-l100000", "-C%d%%" % self.options.git_similarity] |
| if self.options.git_find_copies_harder: |