Skip to content

Commit f311886

Browse files
periperidipgitster
authored andcommitted
submodule: rename helper functions to avoid ambiguity
The helper functions: show_submodule_summary(), prepare_submodule_summary() and print_submodule_summary() are used by the builtin_diff() function in diff.c to generate a summary of submodules in the context of a diff. Functions with similar names are to be introduced in the upcoming port of submodule's summary subcommand. So, rename the helper functions to '*_diff_submodule_summary()' to avoid ambiguity. Mentored-by: Christian Couder <[email protected]> Mentored-by: Kaartic Sivaraam <[email protected]> Signed-off-by: Shourya Shukla <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent aa6949e commit f311886

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3429,7 +3429,7 @@ static void builtin_diff(const char *name_a,
34293429
if (o->submodule_format == DIFF_SUBMODULE_LOG &&
34303430
(!one->mode || S_ISGITLINK(one->mode)) &&
34313431
(!two->mode || S_ISGITLINK(two->mode))) {
3432-
show_submodule_summary(o, one->path ? one->path : two->path,
3432+
show_submodule_diff_summary(o, one->path ? one->path : two->path,
34333433
&one->oid, &two->oid,
34343434
two->dirty_submodule);
34353435
return;

submodule.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
438438
*/
439439
}
440440

441-
static int prepare_submodule_summary(struct rev_info *rev, const char *path,
441+
static int prepare_submodule_diff_summary(struct rev_info *rev, const char *path,
442442
struct commit *left, struct commit *right,
443443
struct commit_list *merge_bases)
444444
{
@@ -459,7 +459,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
459459
return prepare_revision_walk(rev);
460460
}
461461

462-
static void print_submodule_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
462+
static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
463463
{
464464
static const char format[] = " %m %s";
465465
struct strbuf sb = STRBUF_INIT;
@@ -610,7 +610,7 @@ static void show_submodule_header(struct diff_options *o,
610610
strbuf_release(&sb);
611611
}
612612

613-
void show_submodule_summary(struct diff_options *o, const char *path,
613+
void show_submodule_diff_summary(struct diff_options *o, const char *path,
614614
struct object_id *one, struct object_id *two,
615615
unsigned dirty_submodule)
616616
{
@@ -632,12 +632,12 @@ void show_submodule_summary(struct diff_options *o, const char *path,
632632
goto out;
633633

634634
/* Treat revision walker failure the same as missing commits */
635-
if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
635+
if (prepare_submodule_diff_summary(&rev, path, left, right, merge_bases)) {
636636
diff_emit_submodule_error(o, "(revision walker failed)\n");
637637
goto out;
638638
}
639639

640-
print_submodule_summary(sub, &rev, o);
640+
print_submodule_diff_summary(sub, &rev, o);
641641

642642
out:
643643
if (merge_bases)

submodule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ int parse_submodule_update_strategy(const char *value,
6969
struct submodule_update_strategy *dst);
7070
const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
7171
void handle_ignore_submodules_arg(struct diff_options *, const char *);
72-
void show_submodule_summary(struct diff_options *o, const char *path,
72+
void show_submodule_diff_summary(struct diff_options *o, const char *path,
7373
struct object_id *one, struct object_id *two,
7474
unsigned dirty_submodule);
7575
void show_submodule_inline_diff(struct diff_options *o, const char *path,

0 commit comments

Comments
 (0)