Merge pull request #375 from vinayinvicible/master

asottile · asottile · commit d845ec6e364f · 2016-06-01T10:17:21.000-07:00
only consider forward diff in changed files
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -51,7 +51,7 @@ def _print_user_skipped(hook, write, args):
 
 def get_changed_files(new, old):
     return cmd_output(
-        'git', 'diff', '--name-only', '{0}..{1}'.format(old, new),
+        'git', 'diff', '--name-only', '{0}...{1}'.format(old, new),
     )[1].splitlines()
 
 
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -401,6 +401,10 @@ def test_get_changed_files():
     )
     assert files == ['CHANGELOG.md', 'setup.py']
 
+    # files changed in source but not in origin should not be returned
+    files = get_changed_files('HEAD~10', 'HEAD')
+    assert files == []
+
 
 def test_lots_of_files(mock_out_store_directory, tempdir_factory):
     # windows xargs seems to have a bug, here's a regression test for

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,10 @@ def test_get_changed_files():`
`401`	`401`	`)`
`402`	`402`	`assert files == ['CHANGELOG.md', 'setup.py']`
`403`	`403`
	`404`	`+ # files changed in source but not in origin should not be returned`
	`405`	`+ files = get_changed_files('HEAD~10', 'HEAD')`
	`406`	`+ assert files == []`
	`407`	`+`
`404`	`408`
`405`	`409`	`def test_lots_of_files(mock_out_store_directory, tempdir_factory):`
`406`	`410`	`# windows xargs seems to have a bug, here's a regression test for`