diff options
| author | Sam Vilain <sam@vilain.net> | 2009-12-19 16:26:26 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-12-21 10:32:53 (GMT) |
| commit | 7a955a5365d9ebd5e12c12ed926b2b51b61c02ee (patch) | |
| tree | f9fab812076328fab4546339b54e32bb88da87e6 /t/t9151-svn-mergeinfo.sh | |
| parent | ea020cbd6aeb769d95e5c2dbffee4c81d6f92796 (diff) | |
| download | git-7a955a5365d9ebd5e12c12ed926b2b51b61c02ee.zip git-7a955a5365d9ebd5e12c12ed926b2b51b61c02ee.tar.gz git-7a955a5365d9ebd5e12c12ed926b2b51b61c02ee.tar.bz2 | |
git-svn: detect cherry-picks correctly.
The old function was incorrect; in some instances it marks a cherry picked
range as a merged branch (because of an incorrect assumption that
'rev-list COMMIT --not RANGE' would work). This is replaced with a
function which should detect them correctly, memoized to limit the expense
of dealing with branches with many cherry picks to one 'merge-base' call
per merge, per branch which used cherry picking.
Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9151-svn-mergeinfo.sh')
| -rwxr-xr-x | t/t9151-svn-mergeinfo.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh index f6e00ea..359eeaa 100755 --- a/t/t9151-svn-mergeinfo.sh +++ b/t/t9151-svn-mergeinfo.sh @@ -15,13 +15,13 @@ test_expect_success 'load svn dump' " git svn fetch --all " -test_expect_failure 'all svn merges became git merge commits' ' +test_expect_success 'all svn merges became git merge commits' ' unmarked=$(git rev-list --parents --all --grep=Merge | grep -v " .* " | cut -f1 -d" ") [ -z "$unmarked" ] ' -test_expect_failure 'cherry picks did not become git merge commits' ' +test_expect_success 'cherry picks did not become git merge commits' ' bad_cherries=$(git rev-list --parents --all --grep=Cherry | grep " .* " | cut -f1 -d" ") [ -z "$bad_cherries" ] |