From f3c688bf2ccbd54a302f69846b97e51c3e2fcc82 Mon Sep 17 00:00:00 2001
From: scottmg <scottmg@chromium.org>
Date: Wed, 15 Jun 2016 17:16:44 -0700
Subject: [PATCH] Fix presubmit checkout test after git 2.9.0

Quoting https://github.com/blog/2188-git-2-9-has-been-released

"""Rename detection is now enabled by default for diffs..."

which broke this test.

R=tandrii@chromium.org, iannucci@chromium.org
BUG=619959

Review-Url: https://codereview.chromium.org/2073553003
---
 tests/checkout_test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/checkout_test.py b/tests/checkout_test.py
index de0d7e6250..bd6b9b712d 100755
--- a/tests/checkout_test.py
+++ b/tests/checkout_test.py
@@ -311,7 +311,8 @@ class GitCheckout(GitBaseTest):
     co = self._get_co(None)
     self._check_move(co)
     out = subprocess2.check_output(
-        ['git', 'diff', '--staged', '--name-status'], cwd=co.project_path)
+        ['git', 'diff', '--staged', '--name-status', '--no-renames'],
+        cwd=co.project_path)
     out = sorted(out.splitlines())
     expected = sorted(
       [