kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: drop useless return values in git-diff helpers 

Since git-diff has many diff modes, it dispatches to many helpers to
perform each one. But every helper simply returns "0", as it exits
directly if there are serious errors (and options like --exit-code are
handled afterwards). So let's get rid of these useless return values,
which makes the code flow more clear.

There's very little chance that we'd later want to propagate errors
instead of dying immediately. These are all static-local helpers for the
git-diff program implementing its various modes. More "lib-ified" code
would directly call the underlying functions.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2023-08-21 16:19:44 -04:00 committed by Junio C Hamano
parent 25bd3acd04
commit c0049ca0d7
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
builtin/diff.c
View File

@ -77,9 +77,9 @@ static void stuff_change(struct diff_options *opt,
diff_queue(&diff_queued_diff, one, two); diff_queue(&diff_queued_diff, one, two);
} }


static int builtin_diff_b_f(struct rev_info *revs, static void builtin_diff_b_f(struct rev_info *revs,
int argc, const char **argv UNUSED, int argc, const char **argv UNUSED,
struct object_array_entry **blob) struct object_array_entry **blob)
{ {
/* Blob vs file in the working tree*/ /* Blob vs file in the working tree*/
struct stat st; struct stat st;
@ -109,12 +109,11 @@ static int builtin_diff_b_f(struct rev_info *revs,
path); path);
diffcore_std(&revs->diffopt); diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt); diff_flush(&revs->diffopt);
return 0;
} }


static int builtin_diff_blobs(struct rev_info *revs, static void builtin_diff_blobs(struct rev_info *revs,
int argc, const char **argv UNUSED, int argc, const char **argv UNUSED,
struct object_array_entry **blob) struct object_array_entry **blob)
{ {
const unsigned mode = canon_mode(S_IFREG | 0644); const unsigned mode = canon_mode(S_IFREG | 0644);


@ -134,11 +133,10 @@ static int builtin_diff_blobs(struct rev_info *revs,
blob_path(blob[0]), blob_path(blob[1])); blob_path(blob[0]), blob_path(blob[1]));
diffcore_std(&revs->diffopt); diffcore_std(&revs->diffopt);
diff_flush(&revs->diffopt); diff_flush(&revs->diffopt);
return 0;
} }


static int builtin_diff_index(struct rev_info *revs, static void builtin_diff_index(struct rev_info *revs,
int argc, const char **argv) int argc, const char **argv)
{ {
unsigned int option = 0; unsigned int option = 0;
while (1 < argc) { while (1 < argc) {
@ -169,13 +167,12 @@ static int builtin_diff_index(struct rev_info *revs,
die_errno("repo_read_cache"); die_errno("repo_read_cache");
} }
run_diff_index(revs, option); run_diff_index(revs, option);
return 0;
} }


static int builtin_diff_tree(struct rev_info *revs, static void builtin_diff_tree(struct rev_info *revs,
int argc, const char **argv, int argc, const char **argv,
struct object_array_entry *ent0, struct object_array_entry *ent0,
struct object_array_entry *ent1) struct object_array_entry *ent1)
{ {
const struct object_id *(oid[2]); const struct object_id *(oid[2]);
struct object_id mb_oid; struct object_id mb_oid;
@ -208,13 +205,12 @@ static int builtin_diff_tree(struct rev_info *revs,
} }
diff_tree_oid(oid[0], oid[1], "", &revs->diffopt); diff_tree_oid(oid[0], oid[1], "", &revs->diffopt);
log_tree_diff_flush(revs); log_tree_diff_flush(revs);
return 0;
} }


static int builtin_diff_combined(struct rev_info *revs, static void builtin_diff_combined(struct rev_info *revs,
int argc, const char **argv UNUSED, int argc, const char **argv UNUSED,
struct object_array_entry *ent, struct object_array_entry *ent,
int ents, int first_non_parent) int ents, int first_non_parent)
{ {
struct oid_array parents = OID_ARRAY_INIT; struct oid_array parents = OID_ARRAY_INIT;
int i; int i;
@ -235,7 +231,6 @@ static int builtin_diff_combined(struct rev_info *revs,
} }
diff_tree_combined(&ent[first_non_parent].item->oid, &parents, revs); diff_tree_combined(&ent[first_non_parent].item->oid, &parents, revs);
oid_array_clear(&parents); oid_array_clear(&parents);
return 0;
} }


static void refresh_index_quietly(void) static void refresh_index_quietly(void)
@ -253,7 +248,7 @@ static void refresh_index_quietly(void)
repo_update_index_if_able(the_repository, &lock_file); repo_update_index_if_able(the_repository, &lock_file);
} }


static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv) static void builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
{ {
unsigned int options = 0; unsigned int options = 0;


@ -291,7 +286,6 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv
die_errno("repo_read_index_preload"); die_errno("repo_read_index_preload");
} }
run_diff_files(revs, options); run_diff_files(revs, options);
return 0;
} }


struct symdiff { struct symdiff {
@ -405,7 +399,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
int blobs = 0, paths = 0; int blobs = 0, paths = 0;
struct object_array_entry *blob[2]; struct object_array_entry *blob[2];
int nongit = 0, no_index = 0; int nongit = 0, no_index = 0;
int result = 0; int result;
struct symdiff sdiff; struct symdiff sdiff;


/* /*
@ -584,17 +578,17 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
if (!ent.nr) { if (!ent.nr) {
switch (blobs) { switch (blobs) {
case 0: case 0:
result = builtin_diff_files(&rev, argc, argv); builtin_diff_files(&rev, argc, argv);
break; break;
case 1: case 1:
if (paths != 1) if (paths != 1)
usage(builtin_diff_usage); usage(builtin_diff_usage);
result = builtin_diff_b_f(&rev, argc, argv, blob); builtin_diff_b_f(&rev, argc, argv, blob);
break; break;
case 2: case 2:
if (paths) if (paths)
usage(builtin_diff_usage); usage(builtin_diff_usage);
result = builtin_diff_blobs(&rev, argc, argv, blob); builtin_diff_blobs(&rev, argc, argv, blob);
break; break;
default: default:
usage(builtin_diff_usage); usage(builtin_diff_usage);
@ -603,18 +597,18 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
else if (blobs) else if (blobs)
usage(builtin_diff_usage); usage(builtin_diff_usage);
else if (ent.nr == 1) else if (ent.nr == 1)
result = builtin_diff_index(&rev, argc, argv); builtin_diff_index(&rev, argc, argv);
else if (ent.nr == 2) { else if (ent.nr == 2) {
if (sdiff.warn) if (sdiff.warn)
warning(_("%s...%s: multiple merge bases, using %s"), warning(_("%s...%s: multiple merge bases, using %s"),
sdiff.left, sdiff.right, sdiff.base); sdiff.left, sdiff.right, sdiff.base);
result = builtin_diff_tree(&rev, argc, argv, builtin_diff_tree(&rev, argc, argv,
&ent.objects[0], &ent.objects[1]); &ent.objects[0], &ent.objects[1]);
} else } else
result = builtin_diff_combined(&rev, argc, argv, builtin_diff_combined(&rev, argc, argv,
ent.objects, ent.nr, ent.objects, ent.nr,
first_non_parent); first_non_parent);
result = diff_result_code(&rev.diffopt, result); result = diff_result_code(&rev.diffopt, 0);
if (1 < rev.diffopt.skip_stat_unmatch) if (1 < rev.diffopt.skip_stat_unmatch)
refresh_index_quietly(); refresh_index_quietly();
release_revisions(&rev); release_revisions(&rev);