changeset 1050:7decccb79f8a

tests: update test-renames.t for new git output
author Sean Farley <sean@farley.io>
date Thu, 17 Aug 2017 13:44:29 -0700
parents 986fbbc53ab6
children 5db8d0d0ae47
files tests/test-renames.t
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-renames.t	Thu Aug 10 15:40:38 2017 -0400
+++ b/tests/test-renames.t	Thu Aug 17 13:44:29 2017 -0700
@@ -46,7 +46,11 @@
   $ sed -e 's/path = gitsubmodule/path = gitsubmodule2/' .gitmodules > .gitmodules-new
   $ mv .gitmodules-new .gitmodules
   $ mv gitsubmodule gitsubmodule2
-  $ git add .gitmodules gitsubmodule2
+
+Previous versions of git did not produce any output but 2.14 changed the output
+to warn the user about submodules
+
+  $ git add .gitmodules gitsubmodule2 2>/dev/null
   $ git rm --cached gitsubmodule
   rm 'gitsubmodule'
   $ fn_git_commit -m 'move submodule'