projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/gitk/gitk
[git.git]
/
t
/
t6001-rev-list-merge-order.sh
diff --git
a/t/t6001-rev-list-merge-order.sh
b/t/t6001-rev-list-merge-order.sh
index
a693c17
..
04dede0
100755
(executable)
--- a/
t/t6001-rev-list-merge-order.sh
+++ b/
t/t6001-rev-list-merge-order.sh
@@
-408,17
+408,17
@@
test_output_expect_success "max-count 10 - merge order" 'git-rev-list --merge-or
| b2
EOF
| b2
EOF
-test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5 | sort' <<EOF
+test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5' <<EOF
+l5
+l4
+l3
a4
a4
-b2
-b3
b4
b4
-c1
-
c
2
+a3
+
a
2
c3
c3
-l3
-l4
-l5
+c2
+b3
EOF
test_output_expect_success '--max-age=c3, no --merge-order' "git-rev-list --max-age=$(commit_date c3) l5" <<EOF
EOF
test_output_expect_success '--max-age=c3, no --merge-order' "git-rev-list --max-age=$(commit_date c3) l5" <<EOF