scm.py - Issue 1583003: Change scm.GIT.CaptureStatus to ignore unmerged upstream changes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scm.py

Issue 1583003: Change scm.GIT.CaptureStatus to ignore unmerged upstream changes. (Closed)

Patch Set: Created 10 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: scm.py

diff --git a/scm.py b/scm.py

index 1b3b72f2c2cb731ac72a93861039ab108387d199..209e064631b554d0902e3897b7b20600b024dbc9 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):

« no previous file with comments | « no previous file | no next file » | no next file with comments »