From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 19 Apr 2020 23:28:57 +0000 (-0700)
Subject: Git 2.20.4
X-Git-Tag: v2.20.4^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=041bc65923e13313ca1b77681c3b2950b5e0a163;p=thirdparty%2Fgit.git

Git 2.20.4

This merges up the security fix from v2.17.5.

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

041bc65923e13313ca1b77681c3b2950b5e0a163
diff --cc Documentation/RelNotes/2.20.4.txt
index 0000000000,0000000000..5a9e24e470
new file mode 100644
--- /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 1482b4d75f,2dbaf7d035..de22ee7afa
--- a/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 d02c89a980,5b8f82f343..0c3010e688
--- a/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 faac610a35,fc40f59c92..c4a9fe624a
--- a/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"