From: Jon Seymour <jon.seymour@gmail.com>
Date: Thu, 30 Jun 2005 02:41:57 +0000 (+1000)
Subject: [PATCH] Fix broken t6001 test case
X-Git-Tag: v0.99~114
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ed35678903f14c8be26b5b4fce1155e4c69230f;p=git.git

[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>
---

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index a693c17df..a1fe0530d 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