From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Dec 2019 21:08:47 +0000 (-0800)
Subject: Merge branch 'js/add-i-a-bit-more-tests'
X-Git-Tag: v2.25.0-rc0~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=011fc2e88e9ab13760c571330737ffaf0986e4ef;p=thirdparty%2Fgit.git

Merge branch 'js/add-i-a-bit-more-tests'

Test coverage update in preparation for further work on "git add -i".

* js/add-i-a-bit-more-tests:
  apply --allow-overlap: fix a corner case
  git add -p: use non-zero exit code when the diff generation failed
  t3701: verify that the diff.algorithm config setting is handled
  t3701: verify the shown messages when nothing can be added
  t3701: add a test for the different `add -p` prompts
  t3701: avoid depending on the TTY prerequisite
  t3701: add a test for advanced split-hunk editing
---

011fc2e88e9ab13760c571330737ffaf0986e4ef