From 14ec50401cbe7e364b5636ed74ae546205bfc452 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Tue, 30 Mar 2010 18:19:09 +0000 Subject: [PATCH] Change scm.GIT.CaptureStatus to ignore unmerged upstream changes. With this CL, the patch that is sent to the code review site includes only changes from the nearest common ancestor of the local and the upstream branch. A diagram: /----B <- local branch ----A-----C <- upstream Previously, the diff would be simply between C and B, whereas now it's between A and C, even if you update C. This allows you to continously update origin/trunk without having to rebase/merge your local changes all the time, resulting in the need for less rebuilds. Review URL: http://codereview.chromium.org/1583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@43113 0039d316-1c4b-4281-b951-d872f2087c98 --- scm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm.py b/scm.py index 1b3b72f2c2..209e064631 100644 --- a/scm.py +++ b/scm.py @@ -70,7 +70,7 @@ class GIT(object): @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):