diff --git a/src/repository/api/git/ArcanistGitAPI.php b/src/repository/api/git/ArcanistGitAPI.php
index 7ac4af56..d74f4dbe 100644
--- a/src/repository/api/git/ArcanistGitAPI.php
+++ b/src/repository/api/git/ArcanistGitAPI.php
@@ -200,7 +200,9 @@ class ArcanistGitAPI extends ArcanistRepositoryAPI {
       if (strlen($stdout)) {
         $stdout = explode("\n", $stdout);
         foreach ($stdout as $file) {
-          $files[$file] = self::FLAG_UNSTAGED;
+          $files[$file] = isset($files[$file])
+            ? ($files[$file] | self::FLAG_UNSTAGED)
+            : self::FLAG_UNSTAGED;
         }
       }