FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[WIP] Added in some diff functions from libgit2 by johnhaley81 · Pull Request #348 · nodegit/nodegit · GitHub

  1. nodegit
  2. nodegit

Repository navigation

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

Merged
kmctown merged 6 commits into
masterfrom
diff-functions
Jan 20, 2015
ConversationCommits (6)ChecksFiles changed
Merged

[WIP] Added in some diff functions from libgit2#348
kmctown merged 6 commits into
masterfrom
diff-functions

Conversation

johnhaley81 commented Jan 13, 2015

Copy link
Copy Markdown
Collaborator

New functions:
git_diff_tree_to_workdir
git_diff_tree_to_workdir_with_index

kmctown commented Jan 16, 2015

Copy link
Copy Markdown
Collaborator

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 commented Jan 17, 2015

Copy link
Copy Markdown
Collaborator

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

kmctown commented Jan 20, 2015

Copy link
Copy Markdown
Collaborator

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

tbranyen commented Jan 20, 2015

Copy link
Copy Markdown
Member

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

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

maxkorp commented Jan 20, 2015

Copy link
Copy Markdown
Collaborator

👍

johnhaley81 commented Jan 20, 2015

Copy link
Copy Markdown
Collaborator Author

Thanks for the PR @kmctown!

kmctown commented Jan 20, 2015

Copy link
Copy Markdown
Collaborator

Np! 👍

johnhaley81 deleted the diff-functions branch January 22, 2015 17:40
johnhaley81 mentioned this pull request Jan 26, 2015
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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

Back | FazBrowse Home | New Git URL