Git 2.18.4

This merges up the security fix from v2.17.5.

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

diff --cc Documentation/RelNotes/2.18.4.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e8ef858a00a7372d4aa384383ad53e1f5ba74d7f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.18.4.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.18.4 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 fd9e5b87b2652b58ce61a232a8459c84911d895e,85d9db5600072dc356e60e4ba2cea046e06cfd74..4ed8c413e5f5a750e5c25f729ec8f3294009fccc
--- 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.18.3
 -DEF_VER=v2.17.5
++DEF_VER=v2.18.4
  
  LF='
  '

diff --cc RelNotes
index 1811ee10b3e152ebc7a71474cf8021dde6b660fb,07012e884f30dc6c8b76c3cf3d7d832b895879e1..70822c3866c85c735ba657b50f749536ef0986c9
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.18.3.txt
 -Documentation/RelNotes/2.17.5.txt
++Documentation/RelNotes/2.18.4.txt

diff --cc credential.c
Simple merge

diff --cc fsck.c
Simple merge

diff --cc http.c
Simple merge

diff --cc t/t5550-http-fetch-dumb.sh
Simple merge