From 683f17ec440afafd2b375fd1b7a80a1aca219b4f Mon Sep 17 00:00:00 2001 From: Kevin Willford Date: Fri, 29 Jul 2016 12:19:18 -0400 Subject: patch-ids: replace the seen indicator with a commit pointer The cherry_pick_list was looping through the original side checking the seen indicator and setting the cherry_flag on the commit. If we save off the commit in the patch_id we can set the cherry_flag on the correct commit when running through the other side when a patch_id match is found. Signed-off-by: Kevin Willford Signed-off-by: Junio C Hamano --- patch-ids.c | 1 + 1 file changed, 1 insertion(+) (limited to 'patch-ids.c') diff --git a/patch-ids.c b/patch-ids.c index db31fa647..bafaae2a6 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -43,6 +43,7 @@ static int init_patch_id_entry(struct patch_id *patch, struct commit *commit, struct patch_ids *ids) { + patch->commit = commit; if (commit_patch_id(commit, &ids->diffopts, patch->patch_id)) return -1; -- cgit v1.2.1