Git 2.19.5

This merges up the security fix from v2.17.5.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

diff --cc Documentation/RelNotes/2.19.5.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..18a4dcbfd6a7a121f8749c4fa423fb0c5ce90047
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.19.5.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.19.5 Release Notes
++=========================
++
++This release merges the security fix that appears in v2.17.5; see
++the release notes for that version for details.

diff --cc GIT-VERSION-GEN
index 6f302a1d0996d94627c0641d047850c8c9770882,4ed8c413e5f5a750e5c25f729ec8f3294009fccc..2dbaf7d03504d123ab32534d794a712a929992a3
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v2.19.4
 -DEF_VER=v2.18.4
++DEF_VER=v2.19.5
  
  LF='
  '

diff --cc RelNotes
index d13adb91576366c504ab5a164500530efe336035,70822c3866c85c735ba657b50f749536ef0986c9..5b8f82f3439c1734c8dd5dcf6a71d8ef9aecaaa5
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.19.4.txt
 -Documentation/RelNotes/2.18.4.txt
++Documentation/RelNotes/2.19.5.txt

diff --cc fsck.c
Simple merge

diff --cc http.c
Simple merge

diff --cc t/t0300-credentials.sh
index b9c0f1f279e6ee1c2dbcb02afeeda37986837140,efed3ea2955a80b75dbdf646752cd1093d21faaa..6d44e7e5ccdb016a3d8c01ce930937c8a4354a16
--- 1/t/t0300-credentials.sh
--- 2/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@@ -291,10 -366,21 +366,20 @@@ test_expect_success 'http paths can be 
  
  test_expect_success 'helpers can abort the process' '
        test_must_fail git \
-               -c credential.helper="!f() { echo quit=1; }; f" \
+               -c credential.helper=quit \
                -c credential.helper="verbatim foo bar" \
-               credential fill >stdout &&
-       test_must_be_empty stdout
+               credential fill >stdout 2>stderr <<-\EOF &&
+       protocol=http
+       host=example.com
+       EOF
 -      >expect &&
 -      test_cmp expect stdout &&
++      test_must_be_empty stdout &&
+       cat >expect <<-\EOF &&
+       quit: get
+       quit: protocol=http
+       quit: host=example.com
+       fatal: credential helper '\''quit'\'' told us to quit
+       EOF
+       test_i18ncmp expect stderr
  '
  
  test_expect_success 'empty helper spec resets helper list' '