diff --git a/pre-upload.py b/pre-upload.py
index 56413c0..56209f1 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -275,7 +275,7 @@
     return cache[path]
 
   if commit == PRE_SUBMIT:
-    content = _run_command(['git', 'diff', 'HEAD', path])
+    content = _run_command(['git', 'diff', 'HEAD', '--', path])
   else:
     content = _run_command(['git', 'show', '%s:%s' % (commit, path)])
   cache[path] = content
@@ -291,10 +291,10 @@
 
   if commit == PRE_SUBMIT:
     command = ['git', 'diff', '-p', '--pretty=format:', '--no-ext-diff', 'HEAD',
-               path]
+               '--', path]
   else:
     command = ['git', 'show', '-p', '--pretty=format:', '--no-ext-diff', commit,
-               path]
+               '--', path]
   output = _run_command(command)
 
   new_lines = []