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

merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' 

Since we want to replace oid,mode pairs with a single diff_filespec,
we will soon want to be able to use the names 'o', 'a', and 'b' for
the three different file versions.  Rename some local variables in
blob_unchanged() that would otherwise conflict.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2019-04-05 08:00:15 -07:00 committed by Junio C Hamano
parent e3de888ca0
commit 93a02c5553
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
merge-recursive.c
View File

@ -3031,9 +3031,10 @@ static int blob_unchanged(struct merge_options *opt,
unsigned a_mode, unsigned a_mode,
int renormalize, const char *path) int renormalize, const char *path)
{ {
struct strbuf o = STRBUF_INIT; struct strbuf obuf = STRBUF_INIT;
struct strbuf a = STRBUF_INIT; struct strbuf abuf = STRBUF_INIT;
int ret = 0; /* assume changed for safety */ int ret = 0; /* assume changed for safety */
const struct index_state *idx = opt->repo->index;


if (a_mode != o_mode) if (a_mode != o_mode)
return 0; return 0;
@ -3043,20 +3044,21 @@ static int blob_unchanged(struct merge_options *opt,
return 0; return 0;


assert(o_oid && a_oid); assert(o_oid && a_oid);
if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a)) if (read_oid_strbuf(opt, o_oid, &obuf) ||
read_oid_strbuf(opt, a_oid, &abuf))
goto error_return; goto error_return;
/* /*
* Note: binary | is used so that both renormalizations are * Note: binary | is used so that both renormalizations are
* performed. Comparison can be skipped if both files are * performed. Comparison can be skipped if both files are
* unchanged since their sha1s have already been compared. * unchanged since their sha1s have already been compared.
*/ */
if (renormalize_buffer(opt->repo->index, path, o.buf, o.len, &o) | if (renormalize_buffer(idx, path, obuf.buf, obuf.len, &obuf) |
renormalize_buffer(opt->repo->index, path, a.buf, a.len, &a)) renormalize_buffer(idx, path, abuf.buf, abuf.len, &abuf))
ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len)); ret = (obuf.len == abuf.len && !memcmp(obuf.buf, abuf.buf, obuf.len));


error_return: error_return:
strbuf_release(&o); strbuf_release(&obuf);
strbuf_release(&a); strbuf_release(&abuf);
return ret; return ret;
} }