Rebase to v2.27.0-rc0

.github/workflows/main.yml

@@ -6,7 +6,39 @@ env:
  DEVELOPER: 1
 
 jobs:
+ ci-config:
+ runs-on: ubuntu-latest
+ outputs:
+ enabled: ${{ steps.check-ref.outputs.enabled }}
+ steps:
+ - name: try to clone ci-config branch
+ continue-on-error: true
+ run: |
+ git -c protocol.version=2 clone \
+ --no-tags \
+ --single-branch \
+ -b ci-config \
+ --depth 1 \
+ --no-checkout \
+ --filter=blob:none \
+ https://github.com/${{ github.repository }} \
+ config-repo &&
+ cd config-repo &&
+ git checkout HEAD -- ci/config
+ - id: check-ref
+ name: check whether CI is enabled for ref
+ run: |
+ enabled=yes
+ if test -x config-repo/ci/config/allow-ref &&
+ ! config-repo/ci/config/allow-ref '${{ github.ref }}'
+ then
+ enabled=no
+ fi
+ echo "::set-output name=enabled::$enabled"
+
  windows-build:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
  runs-on: windows-latest
  steps:
  - uses: actions/checkout@v1
@@ -89,6 +121,8 @@ jobs:
  name: failed-tests-windows
  path: ${{env.FAILED_TEST_ARTIFACTS}}
  vs-build:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
  env:
  MSYSTEM: MINGW64
  NO_PERL: 1
@@ -187,6 +221,8 @@ jobs:
  ${{matrix.nr}} 10 t[0-9]*.sh)
  "@
  regular:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
  strategy:
  matrix:
  vector:
@@ -222,6 +258,8 @@ jobs:
  name: failed-tests-${{matrix.vector.jobname}}
  path: ${{env.FAILED_TEST_ARTIFACTS}}
  dockerized:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
  strategy:
  matrix:
  vector:
@@ -246,6 +284,8 @@ jobs:
  name: failed-tests-${{matrix.vector.jobname}}
  path: ${{env.FAILED_TEST_ARTIFACTS}}
  static-analysis:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
  env:
  jobname: StaticAnalysis
  runs-on: ubuntu-latest
@@ -254,6 +294,8 @@ jobs:
  - run: ci/install-dependencies.sh
  - run: ci/run-static-analysis.sh
  documentation:
+ needs: ci-config
+ if: needs.ci-config.outputs.enabled == 'yes'
  env:
  jobname: Documentation
  runs-on: ubuntu-latest

.gitignore

@@ -25,6 +25,7 @@
 /git-bisect--helper
 /git-blame
 /git-branch
+/git-bugreport
 /git-bundle
 /git-cat-file
 /git-check-attr
@@ -83,7 +84,6 @@
 /git-init-db
 /git-interpret-trailers
 /git-instaweb
-/git-legacy-stash
 /git-log
 /git-ls-files
 /git-ls-remote
@@ -189,6 +189,7 @@
 /gitweb/gitweb.cgi
 /gitweb/static/gitweb.js
 /gitweb/static/gitweb.min.*
+/config-list.h
 /command-list.h
 *.tar.gz
 *.dsc

Documentation/CodingGuidelines

@@ -91,16 +91,10 @@ For shell scripts specifically (not exhaustive):
 
  - No shell arrays.
 
- - No strlen ${#parameter}.
-
  - No pattern replacement ${parameter/pattern/string}.
 
  - We use Arithmetic Expansion $(( ... )).
 
- - Inside Arithmetic Expansion, spell shell variables with $ in front
- of them, as some shells do not grok $((x)) while accepting $(($x))
- just fine (e.g. dash older than 0.5.4).
-
  - We do not use Process Substitution <(list) or >(list).
 
  - Do not write control structures on a single line with semicolon.
@@ -238,6 +232,18 @@ For C programs:
  while( condition )
  func (bar+1);
 
+ - Do not explicitly compare an integral value with constant 0 or '\0',
+ or a pointer value with constant NULL. For instance, to validate that
+ counted array <ptr, cnt> is initialized but has no elements, write:
+
+ if (!ptr || cnt)
+ BUG("empty array expected");
+
+ and not:
+
+ if (ptr == NULL || cnt != 0);
+ BUG("empty array expected");
+
  - We avoid using braces unnecessarily. I.e.
 
  if (bla) {

Documentation/Makefile

@@ -30,6 +30,7 @@ MAN7_TXT += gitcredentials.txt
 MAN7_TXT += gitcvs-migration.txt
 MAN7_TXT += gitdiffcore.txt
 MAN7_TXT += giteveryday.txt
+MAN7_TXT += gitfaq.txt
 MAN7_TXT += gitglossary.txt
 MAN7_TXT += gitnamespaces.txt
 MAN7_TXT += gitremote-helpers.txt
@@ -149,32 +150,9 @@ endif
 -include ../config.mak.autogen
 -include ../config.mak
 
-#
-# For docbook-xsl ...
-# -1.68.1, no extra settings are needed?
-# 1.69.0, set ASCIIDOC_ROFF?
-# 1.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP?
-# 1.71.1, set ASCIIDOC_ROFF?
-# 1.72.0, set DOCBOOK_XSL_172.
-# 1.73.0-, no extra settings are needed
-#
-
-ifdef DOCBOOK_XSL_172
-ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
-MANPAGE_XSL = manpage-1.72.xsl
-else
- ifndef ASCIIDOC_ROFF
- # docbook-xsl after 1.72 needs the regular XSL, but will not
- # pass-thru raw roff codes from asciidoc.conf, so turn them off.
- ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
- endif
-endif
 ifndef NO_MAN_BOLD_LITERAL
 XMLTO_EXTRA += -m manpage-bold-literal.xsl
 endif
-ifdef DOCBOOK_SUPPRESS_SP
-XMLTO_EXTRA += -m manpage-suppress-sp.xsl
-endif
 
 # Newer DocBook stylesheet emits warning cruft in the output when
 # this is not set, and if set it shows an absolute link. Older

Documentation/MyFirstObjectWalk.txt

@@ -357,9 +357,6 @@ static void walken_commit_walk(struct rev_info *rev)
  ...
 
  while ((commit = get_revision(rev))) {
- if (!commit)
- continue;
-
  strbuf_reset(&prettybuf);
  pp_commit_easy(CMIT_FMT_ONELINE, commit, &prettybuf);
  puts(prettybuf.buf);