X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9151-svn-mergeinfo.sh;h=f57daf401ac7c36c1d9f2380200e0efad2400f70;hb=375fe9262b61d924266656ea6615e25a1579c464;hp=9bee516358bd98d1b5c701f6aa0c4f3e4d95bd45;hpb=1a507b9cf75bcb2de2391c584539e0ff202549bf;p=git.git diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh index 9bee51635..f57daf401 100755 --- a/t/t9151-svn-mergeinfo.sh +++ b/t/t9151-svn-mergeinfo.sh @@ -15,7 +15,11 @@ test_expect_success 'load svn dump' " git svn fetch --all " -test_expect_success 'svn merges were represented coming in' " +test_expect_success 'represent svn merges without intervening commits' " + [ `git cat-file commit HEAD^1 | grep parent | wc -l` -eq 2 ] + " + +test_expect_success 'represent svn merges with intervening commits' " [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ] "