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 <kcwillford@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kevin Willford
2016-07-29 12:19:18 -04:00
committed by Junio C Hamano
parent dfb7a1b4d0
commit 683f17ec44
3 changed files with 5 additions and 16 deletions

View File

@@ -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;