From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2018 22:08:21 +0000 (-0700)
Subject: Merge branch 'js/t7406-recursive-submodule-update-order-fix'
X-Git-Tag: v2.19.0-rc0~83
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10639c395a365ab9e4f71a208746d9fc0236d2bb?ds=inline;hp=-c

Merge branch 'js/t7406-recursive-submodule-update-order-fix'

Test fix.

* js/t7406-recursive-submodule-update-order-fix:
t7406: avoid failures solely due to timing issues
---

10639c395a365ab9e4f71a208746d9fc0236d2bb
diff --combined t/t7406-submodule-update.sh
index f604ef7a72,4937ebb671..686e6a439e
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@@ -115,17 -115,17 +115,17 @@@ Submodule path '../super/submodule': ch
  EOF
  
  cat <<EOF >expect2
+ Cloning into '$pwd/recursivesuper/super/merging'...
+ Cloning into '$pwd/recursivesuper/super/none'...
+ Cloning into '$pwd/recursivesuper/super/rebasing'...
+ Cloning into '$pwd/recursivesuper/super/submodule'...
  Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
  Submodule 'none' ($pwd/none) registered for path '../super/none'
  Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
  Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
- Cloning into '$pwd/recursivesuper/super/merging'...
  done.
- Cloning into '$pwd/recursivesuper/super/none'...
  done.
- Cloning into '$pwd/recursivesuper/super/rebasing'...
  done.
- Cloning into '$pwd/recursivesuper/super/submodule'...
  done.
  EOF
  
@@@ -137,7 -137,8 +137,8 @@@ test_expect_success 'submodule update -
  	 git submodule update --init --recursive ../super >../../actual 2>../../actual2
  	) &&
  	test_i18ncmp expect actual &&
- 	test_i18ncmp expect2 actual2
+ 	sort actual2 >actual2.sorted &&
+ 	test_i18ncmp expect2 actual2.sorted
  '
  
  cat <<EOF >expect2
@@@ -865,9 -866,9 +866,9 @@@ test_expect_success 'submodule update p
  	 (cd submodule/subsubmodule &&
  	  git log > ../../expected
  	 ) &&
 -	 (cd .git/modules/submodule/modules/subsubmodule
 +	 (cd .git/modules/submodule/modules/subsubmodule &&
  	  git log > ../../../../../actual
 -	 )
 +	 ) &&
  	 test_cmp actual expected
  	)
  '
@@@ -886,7 -887,7 +887,7 @@@ test_expect_success 'submodule update p
  	 git commit -am "pre move" &&
  	 H2=$(git rev-parse --short HEAD) &&
  	 git status | sed "s/$H/XXX/" >expect &&
 -	 H=$(cd submodule2; git rev-parse HEAD) &&
 +	 H=$(cd submodule2 && git rev-parse HEAD) &&
  	 git rm --cached submodule2 &&
  	 rm -rf submodule2 &&
  	 mkdir -p "moved/sub module" &&