mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

Browse Source 
* tr/void-diff-setup-done:
  diff_setup_done(): return void
This commit is contained in:
Junio C Hamano
2012-09-11 10:53:40 -07:00
parent 3f835949e9 28452655af
commit 738c218760
13 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@ -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)