From 41c9560ee5f9fc4bd3c6580272bd292083a9fe18 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Fri, 24 Jun 2016 23:09:24 +0000 Subject: diff: rename struct diff_filespec's sha1_valid member Now that this struct's sha1 member is called "oid", update the comment and the sha1_valid member to be called "oid_valid" instead. The following Coccinelle semantic patch was used to implement this, followed by the transformations in object_id.cocci: @@ struct diff_filespec o; @@ - o.sha1_valid + o.oid_valid @@ struct diff_filespec *p; @@ - p->sha1_valid + p->oid_valid Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- diffcore-break.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diffcore-break.c') diff --git a/diffcore-break.c b/diffcore-break.c index a3e796089f..881a74f29e 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -57,7 +57,7 @@ static int should_break(struct diff_filespec *src, return 1; /* even their types are different */ } - if (src->sha1_valid && dst->sha1_valid && + if (src->oid_valid && dst->oid_valid && !oidcmp(&src->oid, &dst->oid)) return 0; /* they are the same */ -- cgit v1.2.3