diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 17:53:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 17:53:40 (GMT) |
| commit | 738c2187604756fea3901554a49f9137e02ed0ef (patch) | |
| tree | ac786621832f1ac568761e96989ca984a836530e /diff.c | |
| parent | 3f835949e9b800619136f2511e84000c95916d6e (diff) | |
| parent | 28452655af988094792483a51d188c58137760cd (diff) | |
| download | git-738c2187604756fea3901554a49f9137e02ed0ef.zip git-738c2187604756fea3901554a49f9137e02ed0ef.tar.gz git-738c2187604756fea3901554a49f9137e02ed0ef.tar.bz2 | |
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -3187,7 +3187,7 @@ void diff_setup(struct diff_options *options) } } -int diff_setup_done(struct diff_options *options) +void diff_setup_done(struct diff_options *options) { int count = 0; @@ -3286,8 +3286,6 @@ int diff_setup_done(struct diff_options *options) options->output_format = DIFF_FORMAT_NO_OUTPUT; DIFF_OPT_SET(options, EXIT_WITH_STATUS); } - - return 0; } static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val) |