mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
diff-files: avoid negative exit value
If loading the index fails, we print an error and then return "-1" from the function. But since this is a builtin, we end up with exit(-1), which produces odd results since program exit codes are unsigned. Because of integer conversion, it usually becomes 255, which is at least still an error, but values above 128 are usually interpreted as signal death. Since we know the program is exiting immediately, we can just replace the error return with a die(). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
976b97e3fd
commit
f126f6ec22
|
@ -80,14 +80,10 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
|
||||||
(rev.diffopt.output_format & DIFF_FORMAT_PATCH))
|
(rev.diffopt.output_format & DIFF_FORMAT_PATCH))
|
||||||
diff_merges_set_dense_combined_if_unset(&rev);
|
diff_merges_set_dense_combined_if_unset(&rev);
|
||||||
|
|
||||||
if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0) {
|
if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0)
|
||||||
perror("repo_read_index_preload");
|
die_errno("repo_read_index_preload");
|
||||||
result = -1;
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
result = run_diff_files(&rev, options);
|
result = run_diff_files(&rev, options);
|
||||||
result = diff_result_code(&rev.diffopt, result);
|
result = diff_result_code(&rev.diffopt, result);
|
||||||
cleanup:
|
|
||||||
release_revisions(&rev);
|
release_revisions(&rev);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue