{"thread":{"id":"47937","subject":"[PATCH v8 30/29] fixup! merge-recursive: apply necessary modifications for directory renames","startedAt":"2018-02-27T21:19:57Z","lastAt":"2018-02-27T21:19:57Z","messageCount":1,"participants":["Elijah Newren"],"isPatch":true,"patchVersion":8,"patchTotal":29},"messages":[{"id":"340448","messageId":"20180227211836.20889-1-newren@gmail.com","threadId":"47937","inReplyTo":null,"subject":"[PATCH v8 30/29] fixup! merge-recursive: apply necessary modifications for directory renames","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-02-27T21:18:36Z","receivedAt":"2018-02-27T21:19:57Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Use is_null_oid() instead of is_null_sha1()\n---\nThis is just a fixup to patch 23/29 in my v8 series for detecting directory renames;\nshould squash cleanly.\n\n merge-recursive.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex ffe1d0d117..6e6ec90e9e 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -667,9 +667,9 @@ static int update_stages_for_stage_data(struct merge_options *opt,\n \toidcpy(&b.oid, &stage_data->stages[3].oid);\n \n \treturn update_stages(opt, path,\n-\t\t\t     is_null_sha1(o.oid.hash) ? NULL : &o,\n-\t\t\t     is_null_sha1(a.oid.hash) ? NULL : &a,\n-\t\t\t     is_null_sha1(b.oid.hash) ? NULL : &b);\n+\t\t\t     is_null_oid(&o.oid) ? NULL : &o,\n+\t\t\t     is_null_oid(&a.oid) ? NULL : &a,\n+\t\t\t     is_null_oid(&b.oid) ? NULL : &b);\n }\n \n static void update_entry(struct stage_data *entry,\n-- \n2.16.1.232.gbf538760f8\n\n"}]}