mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-29 06:20:56 +00:00
Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimal
examples/diff: Add minimal, patience diff options.
This commit is contained in:
commit
68581754f3
@ -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
|
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
|
gaps right now and this helps demonstrate how to use the library. Here
|
||||||
are some specific ideas:
|
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
|
* Add the `--shortstat` flag to `examples/diff.c` based on the work
|
||||||
that was done to add `--numstat` already.
|
that was done to add `--numstat` already.
|
||||||
* Fix the `examples/diff.c` implementation of the `-B`
|
* Fix the `examples/diff.c` implementation of the `-B`
|
||||||
|
@ -234,6 +234,10 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
|
|||||||
o->diffopts.flags |= GIT_DIFF_INCLUDE_IGNORED;
|
o->diffopts.flags |= GIT_DIFF_INCLUDE_IGNORED;
|
||||||
else if (!strcmp(a, "--untracked"))
|
else if (!strcmp(a, "--untracked"))
|
||||||
o->diffopts.flags |= GIT_DIFF_INCLUDE_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"))
|
else if (!strcmp(a, "--numstat"))
|
||||||
o->numstat = 1;
|
o->numstat = 1;
|
||||||
else if (match_uint16_arg(
|
else if (match_uint16_arg(
|
||||||
|
Loading…
Reference in New Issue
Block a user