summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-30 02:41:59 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 03:53:10 (GMT)
commit9d89d19c4873f73f3165e1cef45fdb17ef39a5d0 (patch)
treea7d98d3ba41041384daffa05380945cd1256a595 /t
parent3ed35678903f14c8be26b5b4fce1155e4c69230f (diff)
downloadgit-9d89d19c4873f73f3165e1cef45fdb17ef39a5d0.zip
git-9d89d19c4873f73f3165e1cef45fdb17ef39a5d0.tar.gz
git-9d89d19c4873f73f3165e1cef45fdb17ef39a5d0.tar.bz2
[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>
Diffstat (limited to 't')
-rwxr-xr-xt/t6001-rev-list-merge-order.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index a1fe053..04dede0 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