summaryrefslogtreecommitdiff
path: root/t/t6001-rev-list-merge-order.sh
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-30 02:41:57 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 03:53:10 (GMT)
commit3ed35678903f14c8be26b5b4fce1155e4c69230f (patch)
tree17112f2d37cc9e004ebf2b232d25e544e647da94 /t/t6001-rev-list-merge-order.sh
parent2ba1beebd37a57ad07c283da67c82847f6cb2ef9 (diff)
downloadgit-3ed35678903f14c8be26b5b4fce1155e4c69230f.zip
git-3ed35678903f14c8be26b5b4fce1155e4c69230f.tar.gz
git-3ed35678903f14c8be26b5b4fce1155e4c69230f.tar.bz2
[PATCH] Fix broken t6001 test case
This fix fixes a t/t6001 test case break that was hidden by a bug in the test case infrastructure. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't/t6001-rev-list-merge-order.sh')
-rwxr-xr-xt/t6001-rev-list-merge-order.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index a693c17..a1fe053 100755
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -408,12 +408,12 @@ test_output_expect_success "max-count 10 - merge order" 'git-rev-list --merge-or
| 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 | entag | sort' <<EOF
+a2
+a3
a4
-b2
b3
b4
-c1
c2
c3
l3