Index: codereview/engine.py
===================================================================
--- codereview/engine.py	(révision 775)
+++ codereview/engine.py	(copie de travail)
@@ -53,11 +53,13 @@
   patches = []
   filename = None
   diff = []
+  skip = False
   for line in data.splitlines(True):
     new_filename = None
     if line.startswith('Index:'):
       unused, new_filename = line.split(':', 1)
       new_filename = new_filename.strip()
+      skip = False
     elif line.startswith('Property changes on:'):
       unused, temp_filename = line.split(':', 1)
       # When a file is modified, paths use '/' between directories, however
@@ -67,6 +69,11 @@
       if temp_filename != filename:
         # File has property changes but no modifications, create a new diff.
         new_filename = temp_filename
+    # Skips metadatas in git patches
+    if line == '-- \n':
+      skip = True
+    if skip:
+      continue
     if new_filename:
       if filename and diff:
         patches.append((filename, ''.join(diff)))
Index: upload.py
===================================================================
--- upload.py	(révision 775)
+++ upload.py	(copie de travail)
@@ -1239,7 +1239,7 @@
     # git config key "diff.external" is used).
     env = os.environ.copy()
     if 'GIT_EXTERNAL_DIFF' in env: del env['GIT_EXTERNAL_DIFF']
-    return RunShell(["git", "diff", "--no-ext-diff", "--full-index", "-M"]
+    return RunShell(["git", "format-patch", "--stdout", "-M"]
                     + extra_args, env=env)
 
   def GetUnknownFiles(self):
@@ -1786,11 +1786,13 @@
   patches = []
   filename = None
   diff = []
+  skip = False
   for line in data.splitlines(True):
     new_filename = None
     if line.startswith('Index:'):
       unused, new_filename = line.split(':', 1)
       new_filename = new_filename.strip()
+      skip = False
     elif line.startswith('Property changes on:'):
       unused, temp_filename = line.split(':', 1)
       # When a file is modified, paths use '/' between directories, however
@@ -1800,6 +1802,11 @@
       if temp_filename != filename:
         # File has property changes but no modifications, create a new diff.
         new_filename = temp_filename
+    # Skips metadatas in git patches
+    if line == '-- \n':
+      skip = True
+    if skip:
+      continue
     if new_filename:
       if filename and diff:
         patches.append((filename, ''.join(diff)))