Skip to content

Enrich incremental blame output #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 19, 2016
Merged

Enrich incremental blame output #411

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6964e3e
Drop dependency on six
nvie Apr 14, 2016
2f1b69a
Return all available data from git-blame
nvie Apr 14, 2016
8da7852
Merge remote-tracking branch 'upstream/master' into enrich-incrementa…
nvie Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'upstream/master' into enrich-incrementa… 
…l-blame-output
  • Loading branch information
@nvie
nvie committed Apr 19, 2016
commit 8da7852780a62d52c3d5012b89a4b15ecf989881
5 changes: 1 addition & 4 deletions git/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,7 @@ def safe_decode(s):
if isinstance(s, unicode):
return s
elif isinstance(s, bytes):
if PRE_PY27:
return s.decode(defenc) # we're screwed
else:
return s.decode(defenc, errors='replace')
return s.decode(defenc, errors='replace')
raise TypeError('Expected bytes or text, but got %r' % (s,))


Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.