[DO NOT MERGE YET] Rebase to v2.20.0-rc0

.clang-format

@@ -6,6 +6,8 @@
 
 # Use tabs whenever we need to fill whitespace that spans at least from one tab
 # stop to the next one.
+#
+# These settings are mirrored in .editorconfig.  Keep them in sync.
 UseTab: Always
 TabWidth: 8
 IndentWidth: 8

.editorconfig

@@ -0,0 +1,16 @@
+[*]
+charset = utf-8
+insert_final_newline = true
+
+# The settings for C (*.c and *.h) files are mirrored in .clang-format.  Keep
+# them in sync.
+[*.{c,h,sh,perl,pl,pm}]
+indent_style = tab
+tab_width = 8
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[COMMIT_EDITMSG]
+max_line_length = 72

.gitattributes

@@ -7,7 +7,11 @@
 *.png binary
 *.py eol=lf diff=python
 *.bat eol=crlf
-/Documentation/git-*.txt eol=lf
+/Documentation/**/*.txt eol=lf
 /command-list.txt eol=lf
 /GIT-VERSION-GEN eol=lf
 /mergetools/* eol=lf
+/Documentation/git-merge.txt conflict-marker-size=32
+/Documentation/gitk.txt conflict-marker-size=32
+/Documentation/user-manual.txt conflict-marker-size=32
+/t/t????-*.sh conflict-marker-size=32

.gitignore

@@ -1,3 +1,6 @@
+/fuzz_corpora
+/fuzz-pack-headers
+/fuzz-pack-idx
 /GIT-BUILD-OPTIONS
 /GIT-CFLAGS
 /GIT-LDFLAGS
@@ -102,8 +105,9 @@
 /git-mergetool--lib
 /git-mktag
 /git-mktree
-/git-name-rev
+/git-multi-pack-index
 /git-mv
+/git-name-rev
 /git-notes
 /git-p4
 /git-pack-redundant

.mailmap

@@ -21,17 +21,20 @@ Anders Kaseorg <[email protected]> <[email protected]>
 Aneesh Kumar K.V <[email protected]>
 Amos Waterland <[email protected]> <[email protected]>
 Amos Waterland <[email protected]> <[email protected]>
+Ben Peart <[email protected]> <[email protected]>
+Ben Peart <[email protected]> <[email protected]>
 Ben Walton <[email protected]> <[email protected]>
 Benoit Sigoure <[email protected]> <[email protected]>
 Bernt Hansen <[email protected]> <[email protected]>
 Brandon Casey <[email protected]> <[email protected]>
-brian m. carlson <[email protected]> Brian M. Carlson <[email protected]>
+brian m. carlson <[email protected]>
 brian m. carlson <[email protected]> <[email protected]>
 Bryan Larsen <[email protected]> <[email protected]>
 Bryan Larsen <[email protected]> <[email protected]>
 Cheng Renquan <[email protected]>
 Chris Shoemaker <[email protected]>
 Chris Wright <[email protected]> <[email protected]>
+Christian Ludwig <[email protected]> <[email protected]>
 Cord Seele <[email protected]> <[email protected]>
 Christian Couder <[email protected]> <[email protected]>
 Christian Stimming <[email protected]> <[email protected]>
@@ -51,6 +54,7 @@ David Reiss <[email protected]> <dreiss@dreiss-vmware.(none)>
 David S. Miller <[email protected]>
 David Turner <[email protected]> <[email protected]>
 David Turner <[email protected]> <[email protected]>
+Derrick Stolee <[email protected]> <[email protected]>
 Deskin Miller <[email protected]>
 Dirk Süsserott <[email protected]>
 Eric Blake <[email protected]> <[email protected]>
@@ -98,6 +102,7 @@ Jens Axboe <[email protected]> <[email protected]>
 Jens Lindström <[email protected]> Jens Lindstrom <[email protected]>
 Jim Meyering <[email protected]> <[email protected]>
 Joachim Berdal Haga <[email protected]>
+Joachim Jablon <[email protected]> <[email protected]>
 Johannes Schindelin <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
@@ -150,13 +155,15 @@ Mark Levedahl <[email protected]> <[email protected]>
 Mark Rada <[email protected]>
 Martin Langhoff <[email protected]> <[email protected]>
 Martin von Zweigbergk <[email protected]> <[email protected]>
+Masaya Suzuki <[email protected]> <[email protected]>
 Matt Draisey <[email protected]> <[email protected]>
 Matt Kraai <[email protected]> <[email protected]>
 Matt McCutchen <[email protected]> <[email protected]>
 Matthias Kestenholz <[email protected]> <[email protected]>
 Matthias Rüster <[email protected]> Matthias Ruester
 Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
 Matthias Urlichs <[email protected]> <[email protected]>
+Matthieu Moy <[email protected]> <[email protected]>
 Michael Coleman <[email protected]>
 Michael J Gruber <[email protected]> <[email protected]>
 Michael J Gruber <[email protected]> <[email protected]>
@@ -180,7 +187,11 @@ Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
 Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
 Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
 Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
+Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
+Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
+Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
 Nicolas Sebrecht <[email protected]> <[email protected]>
+Orgad Shaneh <[email protected]> <[email protected]>
 Paolo Bonzini <[email protected]> <[email protected]>
 Pascal Obry <[email protected]> <[email protected]>
 Pascal Obry <[email protected]> <[email protected]>
@@ -200,6 +211,7 @@ Philipp A. Hartmann <[email protected]> <[email protected]>
 Philippe Bruhat <[email protected]>
 Ralf Thielow <[email protected]> <[email protected]>
 Ramsay Jones <[email protected]> <[email protected]>
+Randall S. Becker <[email protected]> <[email protected]>
 René Scharfe <[email protected]> <[email protected]>
 René Scharfe <[email protected]> Rene Scharfe
 Richard Hansen <[email protected]> <[email protected]>
@@ -238,6 +250,7 @@ Steven Walter <[email protected]> <[email protected]>
 Sven Verdoolaege <[email protected]> <[email protected]>
 Sven Verdoolaege <[email protected]> <[email protected]>
 SZEDER Gábor <[email protected]> <[email protected]>
+Tao Qingyun <[email protected]> <[email protected]>
 Tay Ray Chuan <[email protected]>
 Ted Percival <[email protected]> <[email protected]>
 Theodore Ts'o <[email protected]>

.travis.yml

@@ -1,7 +1,5 @@
 language: c
 
-sudo: false
-
 cache:
   directories:
     - $HOME/travis-cache
@@ -14,16 +12,6 @@ compiler:
   - clang
   - gcc
 
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - language-pack-is
-    - git-svn
-    - apache2
-    - gcc-8
-
 matrix:
   include:
     - env: jobname=GETTEXT_POISON
@@ -52,22 +40,11 @@ matrix:
     - env: jobname=StaticAnalysis
       os: linux
       compiler:
-      addons:
-        apt:
-          packages:
-          - coccinelle
-      before_install:
       script: ci/run-static-analysis.sh
       after_failure:
     - env: jobname=Documentation
       os: linux
       compiler:
-      addons:
-        apt:
-          packages:
-          - asciidoc
-          - xmlto
-      before_install:
       script: ci/test-documentation.sh
       after_failure:
 

Documentation/CodingGuidelines

@@ -118,6 +118,24 @@ For shell scripts specifically (not exhaustive):
 		do this
 	fi
 
+ - If a command sequence joined with && or || or | spans multiple
+   lines, put each command on a separate line and put && and || and |
+   operators at the end of each line, rather than the start. This
+   means you don't need to use \ to join lines, since the above
+   operators imply the sequence isn't finished.
+
+	(incorrect)
+	grep blob verify_pack_result \
+	| awk -f print_1.awk \
+	| sort >actual &&
+	...
+
+	(correct)
+	grep blob verify_pack_result |
+	awk -f print_1.awk |
+	sort >actual &&
+	...
+
  - We prefer "test" over "[ ... ]".
 
  - We do not write the noiseword "function" in front of shell
@@ -358,7 +376,10 @@ For C programs:
    string_list for sorted string lists, a hash map (mapping struct
    objects) named "struct decorate", amongst other things.
 
- - When you come up with an API, document it.
+ - When you come up with an API, document its functions and structures
+   in the header file that exposes the API to its callers. Use what is
+   in "strbuf.h" as a model for the appropriate tone and level of
+   detail.
 
  - The first #include in C files, except in platform specific compat/
    implementations, must be either "git-compat-util.h", "cache.h" or

Documentation/Makefile

@@ -285,7 +285,7 @@ docdep_prereqs = \
 	mergetools-list.made $(mergetools_txt) \
 	cmd-list.made $(cmds_txt)
 
-doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl
+doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt) build-docdep.perl
 	$(QUIET_GEN)$(RM) [email protected] $@ && \
 	$(PERL_PATH) ./build-docdep.perl >[email protected] $(QUIET_STDERR) && \
 	mv [email protected] $@
@@ -344,7 +344,7 @@ $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
 	mv [email protected] $@
 
 manpage-base-url.xsl: manpage-base-url.xsl.in
-	sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
+	$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
 
 %.1 %.5 %.7 : %.xml manpage-base-url.xsl
 	$(QUIET_XMLTO)$(RM) $@ && \