Git 2.19.4

Signed-off-by: Junio C Hamano <[email protected]>

diff --cc Documentation/RelNotes/2.19.4.txt
index 0000000,0000000..35d0ae5
new file mode 100644 (file)
--- /dev/null
--- /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 2fcc9d9,fd9e5b8..6f302a1
--- 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.3
 -DEF_VER=v2.18.3
++DEF_VER=v2.19.4
  
  LF='
  '

diff --cc RelNotes
index 36e84fc,1811ee1..d13adb9
--- 1/RelNotes
--- 2/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 78ce79c,55bd432..6b1e5c1
--- 1/fsck.c
--- 2/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;

diff --cc t/t0300-credentials.sh
Simple merge