8000 diff.blobToBuffer: Fix passing in Buffers instead of strings. by tylerchurch · Pull Request #964 · nodegit/nodegit · GitHub
[go: up one dir, main page]
Skip to content

diff.blobToBuffer: Fix passing in Buffers instead of strings. #964

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
johnhaley81 merged 2 commits into from
Mar 24, 2016
Merged

diff.blobToBuffer: Fix passing in Buffers instead of strings. #964

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da71a29
diff.blobToBuffer: Fix passing in Buffers instead of strings.
tylerchurch Mar 23, 2016
a87b573
Diff.blobToBuffer: consistently use Buffer.byteLength
tylerchurch Mar 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
J 8000 ump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Diff.blobToBuffer= function(
var bufferLength;
if (buffer instanceof Buffer) {
bufferText = buffer.toString("utf8");
bufferLength = buffer.length;
bufferLength = Buffer.byteLength(buffer, "utf8");
} else {
bufferText = buffer;
bufferLength = !buffer ? 0 : Buffer.byteLength(buffer, "utf8");
Expand All @@ -84,7 +84,7 @@ Diff.blobToBuffer= function(
this,
old_blob,
old_as_path,
buffer,
bufferText,
bufferLength,
buffer_as_path,
opts,
Expand Down
0