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

INCLUDE_UNTRACKED option not working for diffs by kmctown · Pull Request #366 · nodegit/nodegit · GitHub

Repository navigation

INCLUDE_UNTRACKED option not working for diffs - #366

Merged
johnhaley81 merged 9 commits into
masterfrom
untracked
Feb 5, 2015
Merged

johnhaley81 merged 9 commits into
masterfrom
untracked

Conversation

kmctown commented Jan 22, 2015

Copy link
Copy Markdown
Collaborator

libgit2 provides diff_options flags to git_diff_tree_to_workdir_with_index such as including untracked (unstaged) files in a diff. I've added that here using the normalizeOptions pattern and it does not seem to be working. I think being able to pass these flags in increases nodegit's usefulness to a wider range of use cases, so I'd like to get this working here.

kmctown closed this Jan 22, 2015
kmctown deleted the untracked branch January 22, 2015 15:53

Copy link
Copy Markdown
Member

Hrm why did you close/delete this?

kmctown commented Jan 22, 2015

Copy link
Copy Markdown
Collaborator Author

Was an accident. Too many commits were on the PR and wanted to clean them up.

kmctown restored the untracked branch January 22, 2015 15:57

Copy link
Copy Markdown
Collaborator

You can just force push to clean them up.

kmctown commented Jan 22, 2015

Copy link
Copy Markdown
Collaborator Author

Will do 👍

Copy link
Copy Markdown
Collaborator

Usually what we've been doing is keeping open a [WIP] PR and would just push to it so people could track what we're doing. When we're ready to actually merge it back in we'd clean up the commits, force push it to the branch and then remove the [WIP] tag.

We're not always diligent about removing the tag though.

Copy link
Copy Markdown
Collaborator

Should we re-open this then?

kmctown commented Jan 22, 2015

Copy link
Copy Markdown
Collaborator Author

Apologize for the mess -- it's set up now as originally intended. On to solving the problem!

Copy link
Copy Markdown
Collaborator

This should be rebased on top of #374 after it's merged. It's going to need the code from that for the callbacks to work properly.

kmctown commented Feb 3, 2015

Copy link
Copy Markdown
Collaborator Author

Sounds like a plan 👍

Copy link
Copy Markdown
Collaborator

#374 is merged. I rebased untracked on top of master.

Copy link
Copy Markdown
Collaborator

The tests on Appveyor that are failing are the same ones that we're trying to fix, and are unrelated to this PR. I say we

johnhaley81 changed the title [WIP] INCLUDE_UNTRACKED option not working for diffs INCLUDE_UNTRACKED option not working for diffs Feb 5, 2015

Copy link
Copy Markdown
Collaborator

Currently the tests fail in AppVeyor on master as well. Fixing those are out of scope of this PR and will be handled in a different one ASAP. That being said I don't think that's a valid reason for halting this right now since it's most likely a problem with the tests themselves and not the library.

Going to go ahead and merge this.

johnhaley81 added a commit that referenced this pull request Feb 5, 2015
INCLUDE_UNTRACKED option not working for diffs
johnhaley81 merged commit df70270 into master Feb 5, 2015
johnhaley81 deleted the untracked branch February 5, 2015 19:45
tbranyen added this to the 0.3.0 milestone Mar 2, 2015
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants


Back | FazBrowse Home | New Git URL