Change scm.GIT.CaptureStatus to ignore unmerged upstream changes.

scm.py

 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """SCM-specific utility classes."""
 
 import glob
 import os
 import re
 import shutil
@@ skipping 52 matching lines @@
         return ('', '')
       raise
 
   @staticmethod
   def CaptureStatus(files, upstream_branch='origin'):
     """Returns git status.
 
     @files can be a string (one file) or a list of files.
 
     Returns an array of (status, file) tuples."""
-    command = ["diff", "--name-status", "-r", "%s.." % upstream_branch]
+    command = ["diff", "--name-status", "-r", "%s..." % upstream_branch]
     if not files:
       pass
     elif isinstance(files, basestring):
       command.append(files)
     else:
       command.extend(files)
 
     status = GIT.Capture(command)[0].rstrip()
     results = []
     if status:
@@ skipping 672 matching lines @@
     if not cur_dir_repo_root:
       return None
 
     while True:
       parent = os.path.dirname(directory)
       if (SVN.CaptureInfo(parent, print_error=False).get(
               "Repository Root") != cur_dir_repo_root):
         break
       directory = parent
     return GetCasedPath(directory)