Git 2.8.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.8.3.txt b/Documentation/RelNotes/2.8.3.txt
index af184783bc07534b1519b0b5081d2350d029029b..fedd9968e5e3f20984cfedb54ec6ebcb0c4514e5 100644 (file)
--- a/Documentation/RelNotes/2.8.3.txt
+++ b/Documentation/RelNotes/2.8.3.txt
@@ -67,4 +67,35 @@ Fixes since v2.8.2
    recurses into, but this was incorrect when the command was not run
    from the root level of the superproject.
 
+ * The test scripts for "git p4" (but not "git p4" implementation
+   itself) has been updated so that they would work even on a system
+   where the installed version of Python is python 3.
+
+ * The "user.useConfigOnly" configuration variable makes it an error
+   if users do not explicitly set user.name and user.email.  However,
+   its check was not done early enough and allowed another error to
+   trigger, reporting that the default value we guessed from the
+   system setting was unusable.  This was a suboptimal end-user
+   experience as we want the users to set user.name/user.email without
+   relying on the auto-detection at all.
+
+ * "git mv old new" did not adjust the path for a submodule that lives
+   as a subdirectory inside old/ directory correctly.
+
+ * "git push" from a corrupt repository that attempts to push a large
+   number of refs deadlocked; the thread to relay rejection notices
+   for these ref updates blocked on writing them to the main thread,
+   after the main thread at the receiving end notices that the push
+   failed and decides not to read these notices and return a failure.
+
+ * A question by "git send-email" to ask the identity of the sender
+   has been updated.
+
+ * Recent update to Git LFS broke "git p4" by changing the output from
+   its "lfs pointer" subcommand.
+
+ * Some multi-byte encoding can have a backslash byte as a later part
+   of one letter, which would confuse "highlight" filter used in
+   gitweb.
+
 Also contains minor documentation updates and code clean-ups.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 34ff007a98156162431d5dd03abaaffe5d0c29a0..dd6dbf7dd909bb14300706bfdc7ea83a164998d2 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,11 +43,12 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v2.8.2/git.html[documentation for release 2.8.2]
+* link:v2.8.3/git.html[documentation for release 2.8.3]
 
 * release notes for
-  link:RelNotes/2.8.2.txt[2.8.2].
-  link:RelNotes/2.8.1.txt[2.8.1].
+  link:RelNotes/2.8.3.txt[2.8.3],
+  link:RelNotes/2.8.2.txt[2.8.2],
+  link:RelNotes/2.8.1.txt[2.8.1],
   link:RelNotes/2.8.0.txt[2.8].
 
 * link:v2.7.3/git.html[documentation for release 2.7.3]

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5f99f23cadea4d17d88331871fa428a0c50c9811..596965a4de6c3d965a6967a2ed94eb79eb762b5f 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.8.2
+DEF_VER=v2.8.3
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 04710daa9567fb905c8213deb8634558d9d0a7aa..eb82eea64fef8ce0d4bcd18e4daab09aa53e026a 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.8.2.txt
\ No newline at end of file
+Documentation/RelNotes/2.8.3.txt
\ No newline at end of file