summaryrefslogtreecommitdiff
path: root/patch-ids.c
diff options
context:
space:
mode:
authorKevin Willford <kewillf@microsoft.com>2016-07-29 16:19:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-29 20:23:03 (GMT)
commit683f17ec440afafd2b375fd1b7a80a1aca219b4f (patch)
tree6b0cf441fcc4069b5c128ffec4127fb610d2087f /patch-ids.c
parentdfb7a1b4d0dafd53bf3980b3bd90668bf8d2a27f (diff)
downloadgit-683f17ec440afafd2b375fd1b7a80a1aca219b4f.zip
git-683f17ec440afafd2b375fd1b7a80a1aca219b4f.tar.gz
git-683f17ec440afafd2b375fd1b7a80a1aca219b4f.tar.bz2
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>
Diffstat (limited to 'patch-ids.c')
-rw-r--r--patch-ids.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/patch-ids.c b/patch-ids.c
index db31fa6..bafaae2 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;