diff --git a/src/parser/diff/ArcanistDiffParser.php b/src/parser/diff/ArcanistDiffParser.php
index 28a7dd83..dfd8fda9 100644
--- a/src/parser/diff/ArcanistDiffParser.php
+++ b/src/parser/diff/ArcanistDiffParser.php
@@ -569,7 +569,11 @@ class ArcanistDiffParser {
 
         // $this->didFailParse("Expected 'index af23f...a98bc' header line.");
       } else {
-        $line = $this->nextLine();
+        // NOTE: In the git case, where this patch is the last change in the
+        // file, we may have a final terminal newline. Skip over it so that
+        // we'll hit the '$line === null' block below. This is covered by the
+        // 'git-empty-file.gitdiff' test case.
+        $line = $this->nextNonemptyLine();
       }
     }
 
diff --git a/src/parser/diff/__tests__/ArcanistDiffParserTestCase.php b/src/parser/diff/__tests__/ArcanistDiffParserTestCase.php
index b69ba362..7e1fdc31 100644
--- a/src/parser/diff/__tests__/ArcanistDiffParserTestCase.php
+++ b/src/parser/diff/__tests__/ArcanistDiffParserTestCase.php
@@ -412,6 +412,12 @@ EOTEXT
           $change->getNewProperties()
         );
         break;
+      case 'git-empty-files.gitdiff':
+        $this->assertEqual(2, count($changes));
+        while ($change = array_shift($changes)) {
+          $this->assertEqual(0, count($change->getHunks()));
+        }
+        break;
       case 'git-commit.gitdiff':
         $this->assertEqual(1, count($changes));
         $change = reset($changes);
diff --git a/src/parser/diff/__tests__/data/basic-missing-both-newlines-plus.udiff b/src/parser/diff/__tests__/data/basic-missing-both-newlines-plus.udiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/basic-missing-new-newline-plus.udiff b/src/parser/diff/__tests__/data/basic-missing-new-newline-plus.udiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/basic-missing-old-newline-plus.udiff b/src/parser/diff/__tests__/data/basic-missing-old-newline-plus.udiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-commit.gitdiff b/src/parser/diff/__tests__/data/git-commit.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-copy-plus.gitdiff b/src/parser/diff/__tests__/data/git-copy-plus.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-copy.gitdiff b/src/parser/diff/__tests__/data/git-copy.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-delete-file.gitdiff b/src/parser/diff/__tests__/data/git-delete-file.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-empty-files.gitdiff b/src/parser/diff/__tests__/data/git-empty-files.gitdiff
new file mode 100644
index 00000000..52cd5c32
--- /dev/null
+++ b/src/parser/diff/__tests__/data/git-empty-files.gitdiff
@@ -0,0 +1,6 @@
+diff --git a/empty b/empty
+new file mode 100644
+index 0000000..e69de29
+diff --git a/empty2 b/empty2
+new file mode 100644
+index 0000000..e69de29
diff --git a/src/parser/diff/__tests__/data/git-ignore-whitespace-only.gitdiff b/src/parser/diff/__tests__/data/git-ignore-whitespace-only.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-merge-header.gitdiff b/src/parser/diff/__tests__/data/git-merge-header.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-move-edit.gitdiff b/src/parser/diff/__tests__/data/git-move-edit.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-move-plus.gitdiff b/src/parser/diff/__tests__/data/git-move-plus.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/git-move.gitdiff b/src/parser/diff/__tests__/data/git-move.gitdiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/svn-binary-diff.svndiff b/src/parser/diff/__tests__/data/svn-binary-diff.svndiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/svn-property-delete.svndiff b/src/parser/diff/__tests__/data/svn-property-delete.svndiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/svn-property-merge.svndiff b/src/parser/diff/__tests__/data/svn-property-merge.svndiff
old mode 100755
new mode 100644
diff --git a/src/parser/diff/__tests__/data/svn-property-modify.svndiff b/src/parser/diff/__tests__/data/svn-property-modify.svndiff
old mode 100755
new mode 100644