From: Jonathan Nieder Date: Sun, 19 Apr 2020 23:26:41 +0000 (-0700) Subject: Git 2.19.5 X-Git-Tag: v2.19.5^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76b54ee9b9944ee70422ac24884f78769cf264f1;p=thirdparty%2Fgit.git Git 2.19.5 This merges up the security fix from v2.17.5. Signed-off-by: Jonathan Nieder --- 76b54ee9b9944ee70422ac24884f78769cf264f1 diff --cc Documentation/RelNotes/2.19.5.txt index 0000000000,0000000000..18a4dcbfd6 new file mode 100644 --- /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 6f302a1d09,4ed8c413e5..2dbaf7d035 --- a/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 d13adb9157,70822c3866..5b8f82f343 --- a/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 t/t0300-credentials.sh index b9c0f1f279,efed3ea295..6d44e7e5cc --- a/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' '