From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Sep 2018 21:31:40 +0000 (-0700)
Subject: Merge branch 'ab/portable-more'
X-Git-Tag: v2.19.0-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28d294a5ea27fef18a987f8b526f5e1e72ede674;p=thirdparty%2Fgit.git

Merge branch 'ab/portable-more'

Portability fix.

* ab/portable-more:
  tests: fix non-portable iconv invocation
  tests: fix non-portable "${var:-"str"}" construct
  tests: fix and add lint for non-portable grep --file
  tests: fix version-specific portability issue in Perl JSON
  tests: use shorter labels in chainlint.sed for AIX sed
  tests: fix comment syntax in chainlint.sed for AIX sed
  tests: fix and add lint for non-portable seq
  tests: fix and add lint for non-portable head -c N
---

28d294a5ea27fef18a987f8b526f5e1e72ede674