Git 2.20.4

This merges up the security fix from v2.17.5.

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

diff --cc Documentation/RelNotes/2.20.4.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5a9e24e4709cbc94d5de0e42a84589e21ba47da8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.20.4.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.20.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 1482b4d75f4d838a30b436f99ed9ba253ccaf229,2dbaf7d03504d123ab32534d794a712a929992a3..de22ee7afad73d406a8b09a817f0199600575b0b
--- 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.20.3
 -DEF_VER=v2.19.5
++DEF_VER=v2.20.4
  
  LF='
  '

diff --cc RelNotes
index d02c89a9809f1673179741a53736874bff3a6713,5b8f82f3439c1734c8dd5dcf6a71d8ef9aecaaa5..0c3010e688fb348f36382db3cc00036fb7d69883
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.20.3.txt
 -Documentation/RelNotes/2.19.5.txt
++Documentation/RelNotes/2.20.4.txt

diff --cc fsck.c
index faac610a355b646b3c8ef0611a17ccedb8b81175,fc40f59c9269b316ea915d10e348989b513ca22b..c4a9fe624a9d4c316530c947dcf25e01e6c21432
--- 1/fsck.c
--- 2/fsck.c
+++ b/fsck.c
@@@ -9,7 -9,9 +9,8 @@@
  #include "tag.h"
  #include "fsck.h"
  #include "refs.h"
+ #include "url.h"
  #include "utf8.h"
 -#include "sha1-array.h"
  #include "decorate.h"
  #include "oidset.h"
  #include "packfile.h"

diff --cc http.c
Simple merge