So far there were no tests checking that log --graph actually works. Note that the tests strip trailing whitespace, as the current --graph emits trailing whitespace on lines that do not contain anything but graph lines. Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx> --- Same as v1. t/t4202-log.sh | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 7b976ee..93966f7 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -134,5 +134,153 @@ test_expect_success 'log --grep -i' ' test_cmp expect actual ' +cat > expect <<EOF +* Second +* sixth +* fifth +* fourth +* third +* second +* initial +EOF + +test_expect_success 'simple log --graph' ' + git log --graph --pretty=tformat:%s >actual && + test_cmp expect actual +' + +test_expect_success 'set up merge history' ' + git checkout -b side HEAD~4 && + test_commit side-1 1 1 && + test_commit side-2 2 2 && + git checkout master && + git merge side +' + +cat > expect <<\EOF +* Merge branch 'side' +|\ +| * side-2 +| * side-1 +* | Second +* | sixth +* | fifth +* | fourth +|/ +* third +* second +* initial +EOF + +test_expect_success 'log --graph with merge' ' + git log --graph --date-order --pretty=tformat:%s | + sed "s/ *$//" >actual && + test_cmp expect actual +' + +cat > expect <<\EOF +* commit master +|\ Merge: A B +| | Author: A U Thor <author@xxxxxxxxxxx> +| | +| | Merge branch 'side' +| | +| * commit side +| | Author: A U Thor <author@xxxxxxxxxxx> +| | +| | side-2 +| | +| * commit tags/side-1 +| | Author: A U Thor <author@xxxxxxxxxxx> +| | +| | side-1 +| | +* | commit master~1 +| | Author: A U Thor <author@xxxxxxxxxxx> +| | +| | Second +| | +* | commit master~2 +| | Author: A U Thor <author@xxxxxxxxxxx> +| | +| | sixth +| | +* | commit master~3 +| | Author: A U Thor <author@xxxxxxxxxxx> +| | +| | fifth +| | +* | commit master~4 +|/ Author: A U Thor <author@xxxxxxxxxxx> +| +| fourth +| +* commit tags/side-1~1 +| Author: A U Thor <author@xxxxxxxxxxx> +| +| third +| +* commit tags/side-1~2 +| Author: A U Thor <author@xxxxxxxxxxx> +| +| second +| +* commit tags/side-1~3 + Author: A U Thor <author@xxxxxxxxxxx> + + initial +EOF + +test_expect_success 'log --graph with full output' ' + git log --graph --date-order --pretty=short | + git name-rev --name-only --stdin | + sed "s/Merge:.*/Merge: A B/;s/ *$//" >actual && + test_cmp expect actual +' + +test_expect_success 'set up more tangled history' ' + git checkout -b tangle HEAD~6 && + test_commit tangle-a tangle-a a && + git merge master~3 && + git merge side~1 && + git checkout master && + git merge tangle +' + +cat > expect <<\EOF +* Merge branch 'tangle' +|\ +| * Merge branch 'side' (early part) into tangle +| |\ +| * \ Merge branch 'master' (early part) into tangle +| |\ \ +| * | | tangle-a +* | | | Merge branch 'side' +|\ \ \ \ +| * | | | side-2 +| | | |/ +| | |/| +| |/| | +| * | | side-1 +* | | | Second +* | | | sixth +| | |/ +| |/| +|/| | +* | | fifth +* | | fourth +|/ / +* | third +|/ +* second +* initial +EOF + +test_expect_success 'log --graph with merge' ' + git log --graph --date-order --pretty=tformat:%s | + sed "s/ *$//" >actual && + test_cmp expect actual +' + test_done -- 1.6.2.rc1.266.gce6c4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
