Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[WIP] Added in some diff functions from libgit2#348

Merged
kmctown merged 6 commits intomasternodegit/nodegit:masterfrom
diff-functionsnodegit/nodegit:diff-functionsCopy head branch name to clipboard
Jan 20, 2015
Merged

[WIP] Added in some diff functions from libgit2#348
kmctown merged 6 commits intomasternodegit/nodegit:masterfrom
diff-functionsnodegit/nodegit:diff-functionsCopy head branch name to clipboard

Conversation

@johnhaley81
Copy link
Collaborator

@johnhaley81 johnhaley81 commented Jan 13, 2015

New functions:
git_diff_tree_to_workdir
git_diff_tree_to_workdir_with_index

@kmctown
Copy link
Collaborator

kmctown commented Jan 16, 2015

Diff.treeToWorkdirWithIndex is finding staged changes, but the line content is incorrect. Have not yet been able to figure out the source of the issue.

@kmctown
Copy link
Collaborator

kmctown commented Jan 17, 2015

Definitely can do that, I actually think it's not even necessary to git add if the right options are passed into the workdir diff function. Currently wandering libgit2 trying to figure out where this broke.

@johnhaley81 johnhaley81 added this to the 0.3.0 milestone Jan 19, 2015
John Haley and others added 5 commits January 20, 2015 06:46
@kmctown
Added in some diff functions from libgit2
b9e2bef 
New functions:
git_diff_tree_to_workdir
git_diff_tree_to_workdir_with_index
@kmctown
Added failing test for Diff.treeToWorkdirWithIndex
3b27c7d
@kmctown
Shuffled around workdir diff unit test stubs
3aa8ddc
@kmctown
Diff workdir tests pass
651f7af 
DiffLine objects have all content and need to be parsed out based on
the content length.
@kmctown
commit.getDiff was diffing backwards
2671a1d
@kmctown
Copy link
Collaborator

kmctown commented Jan 20, 2015

@johnhaley81 rebased 0.2.5 code from master and it looks ready to go

@tbranyen
Copy link
Member

tbranyen commented Jan 20, 2015

Looks good to merge! @kmctown feel free to merge.

kmctown added a commit that referenced this pull request Jan 20, 2015
@kmctown
Merge pull request #348 from nodegit/diff-functions
7b7de64 
[WIP] Added in some diff functions from libgit2
@kmctown kmctown merged commit 7b7de64 into master Jan 20, 2015
@maxkorp
Copy link
Collaborator

maxkorp commented Jan 20, 2015

👍

@johnhaley81
Copy link
Collaborator Author

johnhaley81 commented Jan 20, 2015

Thanks for the PR @kmctown!

@kmctown
Copy link
Collaborator

kmctown commented Jan 20, 2015

Np! 👍

@johnhaley81 johnhaley81 deleted the diff-functions branch January 22, 2015 17:40
@johnhaley81 johnhaley81 mentioned this pull request Jan 26, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.3.0

Development

Successfully merging this pull request may close these issues.

4 participants

@johnhaley81 @kmctown @tbranyen @maxkorp
Morty Proxy This is a proxified and sanitized view of the page, visit original site.