diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-08 13:10:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-08 13:10:27 -0700 |
| commit | 0290bf1250533442aa870d303e56745388d562c2 (patch) | |
| tree | 7c0edf4d8f27084c1cb0b6d2511d0e6d95b370bf /t | |
| parent | Sync with 1.8.2.1 (diff) | |
| download | tgif-0290bf1250533442aa870d303e56745388d562c2.tar.xz | |
Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013-01-17)
Kevin Bracey reports that the change regresses a case shown in the
user manual.
Trading one fix with another breakage is not worth it. Just keep
the test to document the existing breakage, and revert the change
for now.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6012-rev-list-simplify.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index 8e2ff13423..dd6dc844e7 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -77,14 +77,16 @@ test_expect_success setup ' 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 && @@ -95,11 +97,15 @@ check_result () { ' } +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_outcome failure '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 |