From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 May 2016 21:54:32 +0000 (-0700)
Subject: Merge branch 'jc/test-parse-options-expect'
X-Git-Tag: v2.9.0-rc0~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2997ea960f7da94d74742ed41006f0afdb2164e7;p=thirdparty%2Fgit.git

Merge branch 'jc/test-parse-options-expect'

t0040 had too many unnecessary repetitions in its test data.  Teach
test-parse-options program so that a caller can tell what it
expects in its output, so that these repetitions can be cleaned up.

* jc/test-parse-options-expect:
  t0040: convert a few tests to use test-parse-options --expect
  t0040: remove unused test helpers
  test-parse-options: --expect=<string> option to simplify tests
  test-parse-options: fix output when callback option fails
---

2997ea960f7da94d74742ed41006f0afdb2164e7