diff options
| author |  Jeff King <peff@peff.net> | 2017-05-19 08:58:05 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-05-24 10:59:27 +0900 |
| commit | d04ec74b17138733463c0ca1024fdbb42be6096a (patch) | |
| tree | 711320a3ef563cdffbc4b8038515e3c179aa87ca /builtin | |
| parent | diff: pass whole pending entry in blobinfo (diff) | |
| download | tgif-d04ec74b17138733463c0ca1024fdbb42be6096a.tar.xz | |
diff: use the word "path" instead of "name" for blobs
The stuff_change() function makes diff_filespecs out of
blobs. The term we generally use for filespecs is "path",
not "name", so let's be consistent here. That will make
things less confusing when the next patch starts caring
about the path/name distinction inside the pending object
array.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 8b276ae575..4c0811d6fc 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -29,8 +29,8 @@ static void stuff_change(struct diff_options *opt, const struct object_id *new_oid, int old_oid_valid, int new_oid_valid, - const char *old_name, - const char *new_name) + const char *old_path, + const char *new_path) { struct diff_filespec *one, *two; @@ -41,16 +41,16 @@ static void stuff_change(struct diff_options *opt, if (DIFF_OPT_TST(opt, REVERSE_DIFF)) { SWAP(old_mode, new_mode); SWAP(old_oid, new_oid); - SWAP(old_name, new_name); + SWAP(old_path, new_path); } if (opt->prefix && - (strncmp(old_name, opt->prefix, opt->prefix_length) || - strncmp(new_name, opt->prefix, opt->prefix_length))) + (strncmp(old_path, opt->prefix, opt->prefix_length) || + strncmp(new_path, opt->prefix, opt->prefix_length))) return; - one = alloc_filespec(old_name); - two = alloc_filespec(new_name); + one = alloc_filespec(old_path); + two = alloc_filespec(new_path); fill_filespec(one, old_oid->hash, old_oid_valid, old_mode); fill_filespec(two, new_oid->hash, new_oid_valid, new_mode); |