Re: [PATCH 4/8] Rename struct diff_filespec's sha1_valid member.

[Johannes Sixt <j6t@kdbg.org>]

Am 07.06.2016 um 02:57 schrieb brian m. carlson:
> 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 standard.cocci:
>
> @@
> struct diff_filespec *p;
> @@
> - p->sha1_valid
> + p->oid_valid
>
> @@
> struct diff_filespec o;
> @@
> - o.sha1_valid
> + o.oid_valid
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
>   combine-diff.c    |  4 ++--
>   diff.c            | 28 ++++++++++++++--------------
>   diffcore-break.c  |  2 +-
>   diffcore-rename.c |  4 ++--
>   diffcore.h        |  2 +-
>   line-log.c        | 10 +++++-----
>   6 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/combine-diff.c b/combine-diff.c
> index f39be434..a20caa80 100644
> --- a/combine-diff.c
> +++ b/combine-diff.c
> @@ -1269,7 +1269,7 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
>   		pair->one[i].path = p->path;
>   		pair->one[i].mode = p->parent[i].mode;
>   		oidcpy(&pair->one->oid, &p->parent[i].oid);
> -		pair->one[i].sha1_valid = !is_null_oid(&p->parent[i].oid);
> +		pair->one->oid_valid = !is_null_oid(&p->parent[i].oid);

Is this transformation correct?

>   		pair->one[i].has_more_entries = 1;
>   	}
>   	pair->one[num_parent - 1].has_more_entries = 0;

-- Hannes