From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 May 2021 20:48:25 +0000 (+0900)
Subject: Merge branch 'cs/http-use-basic-after-failed-negotiate'
X-Git-Tag: v2.32.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c69f2f8c869361e9e2bdb9fb3ceb2fe058013744;p=thirdparty%2Fgit.git

Merge branch 'cs/http-use-basic-after-failed-negotiate'

Regression fix for a change made during this cycle.

* cs/http-use-basic-after-failed-negotiate:
  Revert "remote-curl: fall back to basic auth if Negotiate fails"
  t5551: test http interaction with credential helpers
---

c69f2f8c869361e9e2bdb9fb3ceb2fe058013744
diff --cc Documentation/RelNotes/2.32.0.txt
index 22f8859b40,1195ee48a9..ed590a7b56
--- a/Documentation/RelNotes/2.32.0.txt
+++ b/Documentation/RelNotes/2.32.0.txt
@@@ -20,119 -9,6 +20,114 @@@ Updates since v2.3
  
  UI, Workflows & Features
  
 + * It does not make sense to make ".gitattributes", ".gitignore" and
 +   ".mailmap" symlinks, as they are supposed to be usable from the
 +   object store (think: bare repositories where HEAD:.mailmap etc. are
 +   used).  When these files are symbolic links, we used to read the
 +   contents of the files pointed by them by mistake, which has been
 +   corrected.
 +
 + * "git stash show" learned to optionally show untracked part of the
 +   stash.
 +
 + * "git log --format='...'" learned "%(describe)" placeholder.
 +
 + * "git repack" so far has been only capable of repacking everything
 +   under the sun into a single pack (or split by size).  A cleverer
 +   strategy to reduce the cost of repacking a repository has been
 +   introduced.
 +
 + * The http codepath learned to let the credential layer to cache the
 +   password used to unlock a certificate that has successfully been
 +   used.
 +
 + * "git commit --fixup=<commit>", which was to tweak the changes made
 +   to the contents while keeping the original log message intact,
 +   learned "--fixup=(amend|reword):<commit>", that can be used to
 +   tweak both the message and the contents, and only the message,
 +   respectively.
 +
-  * When accessing a server with a URL like https://user:pass@site/, we
-    did not to fall back to the basic authentication with the
-    credential material embedded in the URL after the "Negotiate"
-    authentication failed.  Now we do.
- 
 + * "git send-email" learned to honor the core.hooksPath configuration.
 +
 + * "git format-patch -v<n>" learned to allow a reroll count that is
 +   not an integer.
 +
 + * "git commit" learned "--trailer <key>[=<value>]" option; together
 +   with the interpret-trailers command, this will make it easier to
 +   support custom trailers.
 +
 + * "git clone --reject-shallow" option fails the clone as soon as we
 +   notice that we are cloning from a shallow repository.
 +
 + * A configuration variable has been added to force tips of certain
 +   refs to be given a reachability bitmap.
 +
 + * "gitweb" learned "e-mail privacy" feature to redact strings that
 +   look like e-mail addresses on various pages.
 +
 + * "git apply --3way" has always been "to fall back to 3-way merge
 +   only when straight application fails". Swap the order of falling
 +   back so that 3-way is always attempted first (only when the option
 +   is given, of course) and then straight patch application is used as
 +   a fallback when it fails.
 +
 + * "git apply" now takes "--3way" and "--cached" at the same time, and
 +   work and record results only in the index.
 +
 + * The command line completion (in contrib/) has learned that
 +   CHERRY_PICK_HEAD is a possible pseudo-ref.
 +
 + * Userdiff patterns for "Scheme" has been added.
 +
 + * "git log" learned "--diff-merges=<style>" option, with an
 +   associated configuration variable log.diffMerges.
 +
 + * "git log --format=..." placeholders learned %ah/%ch placeholders to
 +   request the --date=human output.
 +
 + * Replace GIT_CONFIG_NOSYSTEM mechanism to decline from reading the
 +   system-wide configuration file with GIT_CONFIG_SYSTEM that lets
 +   users specify from which file to read the system-wide configuration
 +   (setting it to an empty file would essentially be the same as
 +   setting NOSYSTEM), and introduce GIT_CONFIG_GLOBAL to override the
 +   per-user configuration in $HOME/.gitconfig.
 +
 + * "git add" and "git rm" learned not to touch those paths that are
 +   outside of sparse checkout.
 +
 + * "git rev-list" learns the "--filter=object:type=<type>" option,
 +   which can be used to exclude objects of the given kind from the
 +   packfile generated by pack-objects.
 +
 + * The command line completion (in contrib/) for "git stash" has been
 +   updated.
 +
 + * "git subtree" updates.
 +
 + * It is now documented that "format-patch" skips merges.
 +
 + * Options to "git pack-objects" that take numeric values like
 +   --window and --depth should not accept negative values; the input
 +   validation has been tightened.
 +
 + * The way the command line specified by the trailer.<token>.command
 +   configuration variable receives the end-user supplied value was
 +   both error prone and misleading.  An alternative to achieve the
 +   same goal in a safer and more intuitive way has been added, as
 +   the trailer.<token>.cmd configuration variable, to replace it.
 +
 + * "git add -i --dry-run" does not dry-run, which was surprising.  The
 +   combination of options has taught to error out.
 +
 + * "git push" learns to discover common ancestor with the receiving
 +   end over protocol v2.  This will hopefully make "git push" as
 +   efficient as "git fetch" in avoiding objects from getting
 +   transferred unnecessarily.
 +
 + * "git mailinfo" (hence "git am") learned the "--quoted-cr" option to
 +   control how lines ending with CRLF wrapped in base64 or qp are
 +   handled.
 +
  
  Performance, Internal Implementation, Development Support etc.