t0005: fix broken &&-chains

diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index 839ad97b791c6aa757d0b82eea7fc16369ad4586..b89cd6b07a3df8f10c89e97ddf5cad7338e065bc 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 &&
-       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 &&
-       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 &&
-       git add file &&
+       >lost &&
+       git add file lost &&
        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 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 &&
@@ -56,36 +61,70 @@ test_expect_success setup '
 
        echo "Final change" >file &&
        test_tick && git commit -a -m "Final change" &&
-       note I
+       note I &&
+
+       git symbolic-ref HEAD refs/heads/unrelated &&
+       git rm -f "*" &&
+       echo "Unrelated branch" >side &&
+       git add side &&
+       test_tick && git commit -m "Side root" &&
+       note J &&
+
+       git checkout master &&
+       test_tick && git merge -m "Coolest" unrelated &&
+       note K &&
+
+       echo "Immaterial" >elif &&
+       git add elif &&
+       test_tick && git commit -m "Last" &&
+       note L
 '
 
 FMT='tformat:%P        %H | %s'
 
-check_result () {
+check_outcome () {
+       outcome=$1
+       shift
        for c in $1
        do
                echo "$c"
        done >expect &&
        shift &&
        param="$*" &&
-       test_expect_success "log $param" '
+       test_expect_$outcome "log $param" '
                git log --pretty="$FMT" --parents $param |
                unnote >actual &&
                sed -e "s/^.*   \([^ ]*\) .*/\1/" >check <actual &&
-               test_cmp expect check || {
-                       cat actual
-                       false
-               }
+               test_cmp expect check
        '
 }
 
-check_result 'I H G F E D C B A' --full-history
-check_result 'I H E C B A' --full-history -- file
-check_result 'I H E C B A' --full-history --topo-order -- file
-check_result 'I H E C B A' --full-history --date-order -- file
+check_result () {
+       check_outcome success "$@"
+}
+
+check_result 'L K J I H G F E D C B A' --full-history
+check_result 'K I H E C B A' --full-history -- file
+check_result 'K I H E C B A' --full-history --topo-order -- file
+check_result 'K I H E C B A' --full-history --date-order -- file
 check_result 'I E C B A' --simplify-merges -- file
 check_result 'I B A' -- 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
+'
+
+test_expect_success '--full-diff is not affected by --parents' '
+       git log -p --pretty="%H" --full-diff -- file >expected &&
+       git log -p --pretty="%H" --full-diff --parents -- file >actual &&
+       test_cmp expected actual
+'
+
 test_done