Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diff: rename diff_fill_sha1_info to diff_fill_oid_info
author
Brandon Williams
<bmwill@google.com>
Tue, 30 May 2017 17:31:09 +0000
(10:31 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 5 Jun 2017 02:23:58 +0000
(11:23 +0900)
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
02491b6
)
diff --git
a/diff.c
b/diff.c
index dd325e61606bb24b24b9fb72a2e30164d93adef1..c758a0d73e3fc6e81796f02ddb45eb342167f4f1 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-3239,7
+3239,7
@@
static void run_diff_cmd(const char *pgm,
fprintf(o->file, "* Unmerged path %s\n", name);
}
fprintf(o->file, "* Unmerged path %s\n", name);
}
-static void diff_fill_
sha1
_info(struct diff_filespec *one)
+static void diff_fill_
oid
_info(struct diff_filespec *one)
{
if (DIFF_FILE_VALID(one)) {
if (!one->oid_valid) {
{
if (DIFF_FILE_VALID(one)) {
if (!one->oid_valid) {
@@
-3298,8
+3298,8
@@
static void run_diff(struct diff_filepair *p, struct diff_options *o)
return;
}
return;
}
- diff_fill_
sha1
_info(one);
- diff_fill_
sha1
_info(two);
+ diff_fill_
oid
_info(one);
+ diff_fill_
oid
_info(two);
if (!pgm &&
DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
if (!pgm &&
DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
@@
-3344,8
+3344,8
@@
static void run_diffstat(struct diff_filepair *p, struct diff_options *o,
if (o->prefix_length)
strip_prefix(o->prefix_length, &name, &other);
if (o->prefix_length)
strip_prefix(o->prefix_length, &name, &other);
- diff_fill_
sha1
_info(p->one);
- diff_fill_
sha1
_info(p->two);
+ diff_fill_
oid
_info(p->one);
+ diff_fill_
oid
_info(p->two);
builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
}
builtin_diffstat(name, other, p->one, p->two, diffstat, o, p);
}
@@
-3368,8
+3368,8
@@
static void run_checkdiff(struct diff_filepair *p, struct diff_options *o)
if (o->prefix_length)
strip_prefix(o->prefix_length, &name, &other);
if (o->prefix_length)
strip_prefix(o->prefix_length, &name, &other);
- diff_fill_
sha1
_info(p->one);
- diff_fill_
sha1
_info(p->two);
+ diff_fill_
oid
_info(p->one);
+ diff_fill_
oid
_info(p->two);
builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
}
builtin_checkdiff(name, other, attr_path, p->one, p->two, o);
}
@@
-4616,8
+4616,8
@@
static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
if (DIFF_PAIR_UNMERGED(p))
continue;
if (DIFF_PAIR_UNMERGED(p))
continue;
- diff_fill_
sha1
_info(p->one);
- diff_fill_
sha1
_info(p->two);
+ diff_fill_
oid
_info(p->one);
+ diff_fill_
oid
_info(p->two);
len1 = remove_space(p->one->path, strlen(p->one->path));
len2 = remove_space(p->two->path, strlen(p->two->path));
len1 = remove_space(p->one->path, strlen(p->one->path));
len2 = remove_space(p->two->path, strlen(p->two->path));