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

Allow git-diff exit with codes similar to diff(1)

Browse Source 
This introduces a new command-line option: --exit-code. The diff
programs will return 1 for differences, return 0 for equality, and
something else for errors.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Alex Riesen
2007-03-14 01:17:04 +01:00
committed by Junio C Hamano
parent 803527f1d9
commit 41bbf9d585
9 changed files with 118 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -2134,6 +2134,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
options->color_diff = options->color_diff_words = 1;
else if (!strcmp(arg, "--no-renames"))
options->detect_rename = 0;
else if (!strcmp(arg, "--exit-code"))
options->exit_with_status = 1;
else
return 0;
return 1;
@ -2910,6 +2912,8 @@ void diffcore_std(struct diff_options *options)
diffcore_order(options->orderfile);
diff_resolve_rename_copy();
diffcore_apply_filter(options->filter);
if (options->exit_with_status)
options->has_changes = !!diff_queued_diff.nr;
}
@ -2920,6 +2924,8 @@ void diffcore_std_no_resolve(struct diff_options *options)
if (options->orderfile)
diffcore_order(options->orderfile);
diffcore_apply_filter(options->filter);
if (options->exit_with_status)
options->has_changes = !!diff_queued_diff.nr;
}
void diff_addremove(struct diff_options *options,