summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-06-24 23:09:24 +0000
committerJunio C Hamano <gitster@pobox.com>2016-06-28 11:39:02 -0700
commit41c9560ee5f9fc4bd3c6580272bd292083a9fe18 (patch)
tree5dd07bbd754dd1ff28abc083ec509cb3ad1ce0d9 /merge-recursive.c
parenta0d12c4433e25e87b67df78b45635df8a098fb23 (diff)
downloadgit-41c9560ee5f9fc4bd3c6580272bd292083a9fe18.tar.gz
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 <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions