| commit | a3c75056dc73661a6cdab180659f52cdb03b357c | |
| author | Steven Walter <swalter@lpdev.prtdev.lexmark.com> | |
| Thu, 2 Sep 2010 22:32:06 +0000 (2 18:32 -0400) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Fri, 24 Sep 2010 08:23:53 +0000 (24 08:23 +0000) | ||
| tree | c788c2a484ca9007c5b9918495ebaf6cfc3df844 | treesnapshot (tar.gz zip) |
| parent | c9be27f39488b20946e3a7ba57d776e03708a1fa | commitdiff |
git-svn: check_cherry_pick should exclude commits already in our history
The merge-base between @$parents and $merge_tip may have been reached
through a merge commit. This means that some commits that are ancestors
of @$parents will not be ancestors of $merge_base. The mergeinfo
property will not list commits that are ancestors of @$parents, so we
need to explicitly exclude them.
[ew: squashed and cleaned up test case from Steven]
Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
The merge-base between @$parents and $merge_tip may have been reached
through a merge commit. This means that some commits that are ancestors
of @$parents will not be ancestors of $merge_base. The mergeinfo
property will not list commits that are ancestors of @$parents, so we
need to explicitly exclude them.
[ew: squashed and cleaned up test case from Steven]
Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
| git-svn.perl | diffblobblamehistory | |
| t/t9157-git-svn-fetch-merge.sh | [new file with mode: 0644] | blob |