git_map_branches.py - Issue 2153803002: map-branches: Fix crash with --show-subject when branch name matches files

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: git_map_branches.py

Issue 2153803002: map-branches: Fix crash with --show-subject when branch name matches files (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools@master

Patch Set: map-branches: Fix crash with --show-subject when branch name matches files Created 4 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: git_map_branches.py

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

index f5951699d7fba0ef8e24bad08ff3984522571fe0..f062d8f2732c7d2028f1b3ddc258ef96d1a34d48 100755

--- a/git_map_branches.py

+++ b/git_map_branches.py

@@ -266,7 +266,7 @@ class BranchMapper(object):

# The subject of the most recent commit on the branch.

if self.show_subject:

- line.append(run('log', '-n1', '--format=%s', branch))

+ line.append(run('log', '-n1', '--format=%s', branch, '--'))

self.output.append(line)

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