From: Jon Seymour <jon.seymour@gmail.com>
Date: Thu, 30 Jun 2005 02:41:59 +0000 (+1000)
Subject: [PATCH] Remove unnecessary sort from t6001 testcase
X-Git-Tag: v0.99~113
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d89d19c4873f73f3165e1cef45fdb17ef39a5d0;p=git.git

[PATCH] Remove unnecessary sort from t6001 testcase

This patch removes an unnecessary sort from the t6001 testcase.

Sorts were previously necessary when testing non --merge-order cases
because the output order wasn't entirely deterministic unless commit
date was fixed.

However, commit dates are now fixed, so the need for a sort has
disappeared.  So the sort has been removed.

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 a1fe0530d..04dede091 100755
--- 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
 
-test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5 | entag | sort' <<EOF
-a2
-a3
+test_output_expect_success "max-count 10 - non merge order" 'git-rev-list --max-count=10 l5' <<EOF
+l5
+l4
+l3
 a4
-b3
 b4
-c2
+a3
+a2
 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