undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,262 Commits 1 Branch 0 Tags 217 MiB
6abbee8c60
Commit Graph

3 Commits

Author SHA1 Message Date
Ramsay Jones
e17aa8a9dc t9157-*.sh: Add an svn version check 
Acked-by: Eric Wong <normalperson@yhbt.net>
Acked-by: Steven Walter <stevenrwalter@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
 2011-01-07 22:14:36 +00:00
Junio C Hamano
dd15c7fffc Make test script t9157 executable 
Fixes a buglet introduced by a3c75056d

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-10-06 12:13:20 -07:00
Steven Walter
a3c75056dc 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>
 2010-09-24 08:23:53 +00:00