Skip to content

Commit 01977f4

Browse files
committed
Git 2.5.0-rc2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 799767c commit 01977f4

File tree

2 files changed

+45
-3
lines changed

2 files changed

+45
-3
lines changed

Documentation/RelNotes/2.5.0.txt

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ UI, Workflows & Features
4646
rely on symbolic links and make sharing of objects and refs safer
4747
by making the borrowee and borrowers aware of each other.
4848

49-
Consider this as still an experimental feature; the UI will likely
50-
to change.
49+
Consider this as still an experimental feature; its UI is still
50+
likely to change.
5151

5252
* Tweak the sample "store" backend of the credential helper to honor
5353
XDG configuration file locations when specified.
@@ -211,6 +211,8 @@ Performance, Internal Implementation, Development Support etc.
211211
underlying "git fetch" and then learned to use parse-options
212212
parser.
213213

214+
* Clarify in the Makefile a guideline to decide use of USE_NSEC.
215+
214216
Also contains various documentation updates and code clean-ups.
215217

216218

@@ -487,6 +489,45 @@ notes for details).
487489
* A minor bugfix when pack bitmap is used with "rev-list --count".
488490
(merge c8a70d3 jk/rev-list-no-bitmap-while-pruning later to maint).
489491

492+
* "git config" failed to update the configuration file when the
493+
underlying filesystem is incapable of renaming a file that is still
494+
open.
495+
(merge 7a64592 kb/config-unmap-before-renaming later to maint).
496+
497+
* Avoid possible ssize_t to int truncation.
498+
(merge 6c8afe4 mh/strbuf-read-file-returns-ssize-t later to maint).
499+
500+
* When you say "!<ENTER>" while running say "git log", you'd confuse
501+
yourself in the resulting shell, that may look as if you took
502+
control back to the original shell you spawned "git log" from but
503+
that isn't what is happening. To that new shell, we leaked
504+
GIT_PAGER_IN_USE environment variable that was meant as a local
505+
communication between the original "Git" and subprocesses that was
506+
spawned by it after we launched the pager, which caused many
507+
"interesting" things to happen, e.g. "git diff | cat" still paints
508+
its output in color by default.
509+
510+
Stop leaking that environment variable to the pager's half of the
511+
fork; we only need it on "Git" side when we spawn the pager.
512+
(merge 124b519 jc/unexport-git-pager-in-use-in-pager later to maint).
513+
514+
* Abandoning an already applied change in "git rebase -i" with
515+
"--continue" left CHERRY_PICK_HEAD and confused later steps.
516+
(merge 0e0aff4 js/rebase-i-clean-up-upon-continue-to-skip later to maint).
517+
518+
* We used to ask libCURL to use the most secure authentication method
519+
available when talking to an HTTP proxy only when we were told to
520+
talk to one via configuration variables. We now ask libCURL to
521+
always use the most secure authentication method, because the user
522+
can tell libCURL to use an HTTP proxy via an environment variable
523+
without using configuration variables.
524+
(merge 5841520 et/http-proxyauth later to maint).
525+
526+
* A fix to a minor regression to "git fsck" in v2.2 era that started
527+
complaining about a body-less tag object when it lacks a separator
528+
empty line after its header to separate it with a non-existent body.
529+
(merge 84d18c0 jc/fsck-retire-require-eoh later to maint).
530+
490531
* Code cleanups and documentation updates.
491532
(merge 0269f96 mm/usage-log-l-can-take-regex later to maint).
492533
(merge 64f2589 nd/t1509-chroot-test later to maint).
@@ -521,3 +562,4 @@ notes for details).
521562
(merge 5330e6e sb/p5310-and-chain later to maint).
522563
(merge c4ac525 tb/checkout-doc later to maint).
523564
(merge e479c5f jk/pretty-encoding-doc later to maint).
565+
(merge 7e837c6 ss/clone-guess-dir-name-simplify later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.5.0-rc1
4+
DEF_VER=v2.5.0-rc2
55

66
LF='
77
'

0 commit comments

Comments
 (0)