diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-14 21:42:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-14 21:42:53 -0800 |
| commit | dfaf75b4698833d820e77e9f42ef93f3b6d3669d (patch) | |
| tree | af298a982053033eab62dcff0650d3eb18b37cc6 /diff.h | |
| parent | d7e92806cdc5ca78c4db879c68f91c70ff9e1ade (diff) | |
| parent | 5973a07937f2c64b595c6784b06eb4441c07b5ef (diff) | |
| download | git-dfaf75b4698833d820e77e9f42ef93f3b6d3669d.tar.xz | |
Merge branch 'wc/diff'
* wc/diff:
Test interaction between diff --check and --exit-code
Use shorter error messages for whitespace problems
Add tests for "git diff --check" with core.whitespace options
Make "diff --check" output match "git apply"
Unify whitespace checking
diff --check: minor fixups
"diff --check" should affect exit status
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -59,6 +59,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_OPT_ALLOW_EXTERNAL (1 << 13) #define DIFF_OPT_EXIT_WITH_STATUS (1 << 14) #define DIFF_OPT_REVERSE_DIFF (1 << 15) +#define DIFF_OPT_CHECK_FAILED (1 << 16) #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) #define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag) @@ -246,4 +247,6 @@ extern int run_diff_index(struct rev_info *revs, int cached); extern int do_diff_cache(const unsigned char *, struct diff_options *); extern int diff_flush_patch_id(struct diff_options *, unsigned char *); +extern int diff_result_code(struct diff_options *, int); + #endif /* DIFF_H */ |