diff: rename diff_fill_sha1_info to diff_fill_oid_info
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
May 30, 2017 at 10:31 UTC
94e327e973d320abf91c22307b87292911643c3b
1 file changed
+9
-9
diff.c
+9
-9
@@ -3239,7 +3239,7 @@ static void run_diff_cmd(const char *pgm,
3239
fprintf(o->file, "* Unmerged path %s\n", name);
3240
}
3241
3242
-static void diff_fill_sha1_info(struct diff_filespec *one)
3242
+static void diff_fill_oid_info(struct diff_filespec *one)
3243
{
3244
if (DIFF_FILE_VALID(one)) {
3245
if (!one->oid_valid) {
@@ -3298,8 +3298,8 @@ static void run_diff(struct diff_filepair *p, struct diff_options *o)
3298
return;
3299
}
3300
3301
- diff_fill_sha1_info(one);
3302
- diff_fill_sha1_info(two);
3301
+ diff_fill_oid_info(one);
3302
+ diff_fill_oid_info(two);
3303
3304
if (!pgm &&
3305
DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
@@ -3344,8 +3344,8 @@ static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
3344
if (o->prefix_length)
3345
strip_prefix(o->prefix_length, &name, &other);
3346
3347
- diff_fill_sha1_info(p->one);
3348
- diff_fill_sha1_info(p->two);
3347
+ diff_fill_oid_info(p->one);
3348
+ diff_fill_oid_info(p->two);
3349
3350
builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
3351
}
@@ -3368,8 +3368,8 @@ static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
3368
if (o->prefix_length)
3369
strip_prefix(o->prefix_length, &name, &other);
3370
3371
- diff_fill_sha1_info(p->one);
3372
- diff_fill_sha1_info(p->two);
3371
+ diff_fill_oid_info(p->one);
3372
+ diff_fill_oid_info(p->two);
3373
3374
builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
3375
}
@@ -4616,8 +4616,8 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
4616
if (DIFF_PAIR_UNMERGED(p))
4617
continue;
4618
4619
- diff_fill_sha1_info(p->one);
4620
- diff_fill_sha1_info(p->two);
4619
+ diff_fill_oid_info(p->one);
4620
+ diff_fill_oid_info(p->two);
4621
4622
len1 = remove_space(p->one->path, strlen(p->one->path));
4623
len2 = remove_space(p->two->path, strlen(p->two->path));