From: Junio C Hamano Date: Tue, 17 Mar 2020 20:37:37 +0000 (-0700) Subject: Git 2.19.4 X-Git-Tag: v2.19.4^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5979d7009017c79b0100b7b66e8567b3ad7b022;p=thirdparty%2Fgit.git Git 2.19.4 Signed-off-by: Junio C Hamano --- a5979d7009017c79b0100b7b66e8567b3ad7b022 diff --cc Documentation/RelNotes/2.19.4.txt index 0000000000,0000000000..35d0ae561b new file mode 100644 --- /dev/null +++ b/Documentation/RelNotes/2.19.4.txt @@@ -1,0 -1,0 +1,5 @@@ ++Git v2.19.4 Release Notes ++========================= ++ ++This release merges the security fix that appears in v2.17.4; see ++the release notes for that version for details. diff --cc GIT-VERSION-GEN index 2fcc9d96d3,fd9e5b87b2..6f302a1d09 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@@ -1,7 -1,7 +1,7 @@@ #!/bin/sh GVF=GIT-VERSION-FILE - DEF_VER=v2.19.3 -DEF_VER=v2.18.3 ++DEF_VER=v2.19.4 LF=' ' diff --cc RelNotes index 36e84fccca,1811ee10b3..d13adb9157 --- a/RelNotes +++ b/RelNotes @@@ -1,1 -1,1 +1,1 @@@ - Documentation/RelNotes/2.19.3.txt -Documentation/RelNotes/2.18.3.txt ++Documentation/RelNotes/2.19.4.txt diff --cc fsck.c index 78ce79cfee,55bd4324e4..6b1e5c1d40 --- a/fsck.c +++ b/fsck.c @@@ -16,7 -14,7 +16,8 @@@ #include "packfile.h" #include "submodule-config.h" #include "config.h" + #include "credential.h" +#include "help.h" static struct oidset gitmodules_found = OIDSET_INIT; static struct oidset gitmodules_done = OIDSET_INIT;