From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 May 2016 01:06:43 +0000 (-0700)
Subject: Merge branch 'js/t6044-use-test-seq'
X-Git-Tag: v2.9.0-rc1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10184b2718db480b4a9bfcb78b6f1c4783dbec85?ds=inline;hp=-c

Merge branch 'js/t6044-use-test-seq'

Test portability fix.

* js/t6044-use-test-seq:
t6044: replace seq by test_seq
---

10184b2718db480b4a9bfcb78b6f1c4783dbec85
diff --combined t/t6044-merge-unrelated-index-changes.sh
index 20a3ffed69,782a1954ee..01023486c5
--- a/t/t6044-merge-unrelated-index-changes.sh
+++ b/t/t6044-merge-unrelated-index-changes.sh
@@@ -20,7 -20,7 +20,7 @@@ test_description="merges with unrelate
  #   Commit E: renames a->subdir/a, adds subdir/e
  
  test_expect_success 'setup trivial merges' '
- 	seq 1 10 >a &&
+ 	test_seq 1 10 >a &&
  	git add a &&
  	test_tick && git commit -m A &&
  
@@@ -42,7 -42,7 +42,7 @@@
  	test_tick && git commit -m C &&
  
  	git checkout D &&
- 	seq 2 10 >a &&
+ 	test_seq 2 10 >a &&
  	echo d >d &&
  	git add a d &&
  	test_tick && git commit -m D &&
@@@ -105,7 -105,7 +105,7 @@@ test_expect_success 'recursive' 
  	test_must_fail git merge -s recursive C^0
  '
  
 -test_expect_failure 'octopus, unrelated file touched' '
 +test_expect_success 'octopus, unrelated file touched' '
  	git reset --hard &&
  	git checkout B^0 &&
  
@@@ -114,7 -114,7 +114,7 @@@
  	test_must_fail git merge C^0 D^0
  '
  
 -test_expect_failure 'octopus, related file removed' '
 +test_expect_success 'octopus, related file removed' '
  	git reset --hard &&
  	git checkout B^0 &&
  
@@@ -123,7 -123,7 +123,7 @@@
  	test_must_fail git merge C^0 D^0
  '
  
 -test_expect_failure 'octopus, related file modified' '
 +test_expect_success 'octopus, related file modified' '
  	git reset --hard &&
  	git checkout B^0 &&