t6012: update test for tweaked full-history traversal

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index dd6dc844e787549ab7622fb4fbec4f89b52e22ab..4e55872b1d3c0f3a71557f84575b386b113d151d 100755 (executable)
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -14,21 +14,24 @@ unnote () {
 
 test_expect_success setup '
        echo "Hi there" >file &&
 
 test_expect_success setup '
        echo "Hi there" >file &&

-       git add file &&
-       test_tick && git commit -m "Initial file" &&
+       echo "initial" >lost &&
+       git add file lost &&
+       test_tick && git commit -m "Initial file and lost" &&

        note A &&
 
        git branch other-branch &&
 
        echo "Hello" >file &&
        note A &&
 
        git branch other-branch &&
 
        echo "Hello" >file &&

-       git add file &&
-       test_tick && git commit -m "Modified file" &&
+       echo "second" >lost &&
+       git add file lost &&
+       test_tick && git commit -m "Modified file and lost" &&

        note B &&
 
        git checkout other-branch &&
 
        echo "Hello" >file &&
        note B &&
 
        git checkout other-branch &&
 
        echo "Hello" >file &&

-       git add file &&
+       >lost &&
+       git add file lost &&

        test_tick && git commit -m "Modified the file identically" &&
        note C &&
 
        test_tick && git commit -m "Modified the file identically" &&
        note C &&
 


@@ -37,7 +40,9 @@ test_expect_success setup '
        test_tick && git commit -m "Add another file" &&
        note D &&
 
        test_tick && git commit -m "Add another file" &&
        note D &&
 

-       test_tick && git merge -m "merge" master &&
+       test_tick &&
+       test_must_fail git merge -m "merge" master &&
+       >lost && git commit -a -m "merge" &&

        note E &&
 
        echo "Yet another" >elif &&
        note E &&
 
        echo "Yet another" >elif &&


@@ -110,4 +115,16 @@ check_result 'I B A' -- file
 check_result 'I B A' --topo-order -- file
 check_result 'H' --first-parent -- another-file
 
 check_result 'I B A' --topo-order -- file
 check_result 'H' --first-parent -- another-file
 

+check_result 'E C B A' --full-history E -- lost
+test_expect_success 'full history simplification without parent' '
+       printf "%s\n" E C B A >expect &&
+       git log --pretty="$FMT" --full-history E -- lost |
+       unnote >actual &&
+       sed -e "s/^.*   \([^ ]*\) .*/\1/" >check <actual &&
+       test_cmp expect check || {
+               cat actual
+               false
+       }
+'
+

 test_done
 test_done