diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-05 11:42:50 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-05 11:42:50 +0100 |
| commit | 68581754f3a37e7712e3983acfeff0ff598e4eb6 (patch) | |
| tree | f2e91804825b6b0ee405819d644daf83efe67a22 | |
| parent | d2b7841d669b0afba5740422958c2c3c2f83dde5 (diff) | |
| parent | 0d3c8a9d9202f69ee0366f2eeab1765b18b49baa (diff) | |
| download | libgit2-68581754f3a37e7712e3983acfeff0ff598e4eb6.tar.gz | |
Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimal
examples/diff: Add minimal, patience diff options.
| -rw-r--r-- | PROJECTS.md | 4 | ||||
| -rw-r--r-- | examples/diff.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/PROJECTS.md b/PROJECTS.md index 34ba18ace..050a51cfb 100644 --- a/PROJECTS.md +++ b/PROJECTS.md @@ -28,10 +28,6 @@ These are good small projects to get started with libgit2. core Git command and add a missing command-line option. There are many gaps right now and this helps demonstrate how to use the library. Here are some specific ideas: - * Add the `--minimal` flag to `examples/diff.c` since the `libgit2` - diff API now has a flag to support it - * Add the `--patience` flag to `examples/diff.c` since it is also now - supported. * Add the `--shortstat` flag to `examples/diff.c` based on the work that was done to add `--numstat` already. * Fix the `examples/diff.c` implementation of the `-B` diff --git a/examples/diff.c b/examples/diff.c index de994ecab..65c618882 100644 --- a/examples/diff.c +++ b/examples/diff.c @@ -234,6 +234,10 @@ static void parse_opts(struct opts *o, int argc, char *argv[]) o->diffopts.flags |= GIT_DIFF_INCLUDE_IGNORED; else if (!strcmp(a, "--untracked")) o->diffopts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; + else if (!strcmp(a, "--patience")) + o->diffopts.flags |= GIT_DIFF_PATIENCE; + else if (!strcmp(a, "--minimal")) + o->diffopts.flags |= GIT_DIFF_MINIMAL; else if (!strcmp(a, "--numstat")) o->numstat = 1; else if (match_uint16_arg( |