Skip to content

Commit 1fe8f2c

Browse files
committed
Git 2.11-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent ab3ad63 commit 1fe8f2c

File tree

2 files changed

+42
-28
lines changed

2 files changed

+42
-28
lines changed

Documentation/RelNotes/2.11.0.txt

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Backward compatibility notes.
55

66
* An empty string used as a pathspec element has always meant
77
'everything matches', but it is too easy to write a script that
8-
finds a path to remove in $path and run 'git rm "$paht"', which
9-
ends up removing everything. This release starts warning about the
8+
finds a path to remove in $path and run 'git rm "$paht"' by
9+
mistake (when the user meant to give "$path"), which ends up
10+
removing everything. This release starts warning about the
1011
use of an empty string that is used for 'everything matches' and
1112
asks users to use a more explicit '.' for that instead.
1213

@@ -144,6 +145,18 @@ UI, Workflows & Features
144145
prevented "git status" to show such a path as "new file" in the
145146
"Changes not staged for commit" section.
146147

148+
* The smudge/clean filter API expect an external process is spawned
149+
to filter the contents for each path that has a filter defined. A
150+
new type of "process" filter API has been added to allow the first
151+
request to run the filter for a path to spawn a single process, and
152+
all filtering need is served by this single process for multiple
153+
paths, reducing the process creation overhead.
154+
155+
* The user always has to say "stash@{$N}" when naming a single
156+
element in the default location of the stash, i.e. reflogs in
157+
refs/stash. The "git stash" command learned to accept "git stash
158+
apply 4" as a short-hand for "git stash apply stash@{4}".
159+
147160

148161
Performance, Internal Implementation, Development Support etc.
149162

@@ -230,6 +243,19 @@ Performance, Internal Implementation, Development Support etc.
230243
* Update of the sequencer codebase to make it reusable to reimplement
231244
"rebase -i" continues.
232245

246+
* Git generally does not explicitly close file descriptors that were
247+
open in the parent process when spawning a child process, but most
248+
of the time the child does not want to access them. As Windows does
249+
not allow removing or renaming a file that has a file descriptor
250+
open, a slow-to-exit child can even break the parent process by
251+
holding onto them. Use O_CLOEXEC flag to open files in various
252+
codepaths.
253+
254+
* Update "interpret-trailers" machinery and teaches it that people in
255+
real world write all sorts of crufts in the "trailer" that was
256+
originally designed to have the neat-o "Mail-Header: like thing"
257+
and nothing else.
258+
233259

234260
Also contains various documentation updates and code clean-ups.
235261

@@ -341,7 +367,6 @@ notes for details).
341367
* The pretty-format specifier "%C(auto)" used by the "log" family of
342368
commands to enable coloring of the output is taught to also issue a
343369
color-reset sequence to the output.
344-
(merge 82b83da8d3 rs/c-auto-resets-attributes later to maint).
345370

346371
* A shell script example in check-ref-format documentation has been
347372
fixed.
@@ -358,7 +383,6 @@ notes for details).
358383
beyond the end of the mapped region. This was fixed by introducing
359384
a regexec_buf() helper that takes a <ptr,len> pair with REG_STARTEND
360385
extension.
361-
(merge 842a516cb0 js/regexec-buf later to maint).
362386

363387
* The procedure to build Git on Mac OS X for Travis CI hardcoded the
364388
internal directory structure we assumed HomeBrew uses, which was a
@@ -383,7 +407,6 @@ notes for details).
383407
mechanism to avoid digging too deep into irrelevant side branches.
384408
This however did not work well over the "smart-http" transport due
385409
to a design bug, which has been fixed.
386-
(merge 06b3d386e0 jt/fetch-pack-in-vain-count-with-stateless later to maint).
387410

388411
* In the codepath that comes up with the hostname to be used in an
389412
e-mail when the user didn't tell us, we looked at ai_canonname
@@ -433,11 +456,9 @@ notes for details).
433456
version of cURL library is available, we forgot to explicitly add
434457
imap(s):// before the destination. To some folks, that didn't work
435458
and the library tried to make HTTP(s) requests instead.
436-
(merge d2d07ab861 ak/curl-imap-send-explicit-scheme later to maint).
437459

438460
* The ./configure script generated from configure.ac was taught how
439461
to detect support of SSL by libcurl better.
440-
(merge 924b7eb1c9 dp/autoconf-curl-ssl later to maint).
441462

442463
* The command-line completion script (in contrib/) learned to
443464
complete "git cmd ^mas<HT>" to complete the negative end of
@@ -464,27 +485,22 @@ notes for details).
464485
Kerberos. We took an unspecified (NULL) username and sent ":"
465486
(i.e. no username, no password) to CURLOPT_USERPWD, but did not do
466487
the same when the username is explicitly set to an empty string.
467-
(merge 5275c3081c dt/http-empty-auth later to maint).
468488

469489
* "git clone" of a local repository can be done at the filesystem
470490
level, but the codepath did not check errors while copying and
471491
adjusting the file that lists alternate object stores.
472-
(merge 22d3b8de1b jk/clone-copy-alternates-fix later to maint).
473492

474493
* Documentation for "git commit" was updated to clarify that "commit
475494
-p <paths>" adds to the current contents of the index to come up
476495
with what to commit.
477-
(merge 7431596ab1 nd/commit-p-doc later to maint).
478496

479497
* A stray symbolic link in $GIT_DIR/refs/ directory could make name
480498
resolution loop forever, which has been corrected.
481-
(merge e8c42cb9ce jk/ref-symlink-loop later to maint).
482499

483500
* The "submodule.<name>.path" stored in .gitmodules is never copied
484501
to .git/config and such a key in .git/config has no meaning, but
485502
the documentation described it and submodule.<name>.url next to
486503
each other as if both belong to .git/config. This has been fixed.
487-
(merge 72710165c9 sb/submodule-config-doc-drop-path later to maint).
488504

489505
* In a worktree connected to a repository elsewhere, created via "git
490506
worktree", "git checkout" attempts to protect users from confusion
@@ -493,29 +509,23 @@ notes for details).
493509
branch, which is designated as the primary branch of a bare
494510
reopsitory, in a worktree that is connected to the bare
495511
repository. The check has been corrected to allow it.
496-
(merge 171c646f8c dk/worktree-dup-checkout-with-bare-is-ok later to maint).
497512

498513
* "git rebase" immediately after "git clone" failed to find the fork
499514
point from the upstream.
500-
(merge 4f21454b55 jk/merge-base-fork-point-without-reflog later to maint).
501515

502516
* When fetching from a remote that has many tags that are irrelevant
503517
to branches we are following, we used to waste way too many cycles
504518
when checking if the object pointed at by a tag (that we are not
505519
going to fetch!) exists in our repository too carefully.
506-
(merge 5827a03545 jk/fetch-quick-tag-following later to maint).
507520

508521
* Protect our code from over-eager compilers.
509-
(merge 0ac52a38e8 jk/tighten-alloc later to maint).
510522

511523
* Recent git allows submodule.<name>.branch to use a special token
512524
"." instead of the branch name; the documentation has been updated
513525
to describe it.
514-
(merge 15ef78008a bw/submodule-branch-dot-doc later to maint).
515526

516527
* A hot-fix for a test added by a recent topic that went to both
517528
'master' and 'maint' already.
518-
(merge 76e368c378 tg/add-chmod+x-fix later to maint).
519529

520530
* "git send-email" attempts to pick up valid e-mails from the
521531
trailers, but people in real world write non-addresses there, like
@@ -529,12 +539,10 @@ notes for details).
529539
in unnecessary failure. This has been corrected by introducing a
530540
new mode to run our tests in the test harness to send the verbose
531541
output separately to the log file.
532-
(merge 614fe01521 jk/tap-verbose-fix later to maint).
533542

534543
* Some AsciiDoc formatter mishandles a displayed illustration with
535544
tabs in it. Adjust a few of them in merge-base documentation to
536545
work around them.
537-
(merge 6750f62699 po/fix-doc-merge-base-illustration later to maint).
538546

539547
* A minor regression fix for "git submodule" that was introduced
540548
when more helper functions were reimplemented in C.
@@ -553,11 +561,17 @@ notes for details).
553561
required to serve.
554562
(merge 6bdb0083be jk/daemon-path-ok-check-truncation later to maint).
555563

564+
* Recent update to git-sh-setup (a library of shell functions that
565+
are used by our in-tree scripted Porcelain commands) included
566+
another shell library git-sh-i18n without specifying where it is,
567+
relying on the $PATH. This has been fixed to be more explicit by
568+
prefixing $(git --exec-path) output in front.
569+
(merge 1073094f30 ak/sh-setup-dot-source-i18n-fix later to maint).
570+
556571
* Other minor doc, test and build updates and code cleanups.
557-
(merge a94bb68397 rs/cocci later to maint).
558-
(merge 641c900b2c js/reset-usage later to maint).
559-
(merge 30cfe72d37 rs/pretty-format-color-doc-fix later to maint).
560-
(merge d709f1fb9d jc/diff-unique-abbrev-comments later to maint).
561-
(merge 13092a916d jc/cocci-xstrdup-or-null later to maint).
562-
(merge 86009f32bb pb/test-parse-options-expect later to maint).
563-
(merge 749a2279a4 yk/git-tag-remove-mention-of-old-layout-in-doc later to maint).
572+
(merge 5c238e29a8 jk/common-main later to maint).
573+
(merge 5a5749e45b ak/pre-receive-hook-template-modefix later to maint).
574+
(merge 6d834ac8f1 jk/rebase-config-insn-fmt-docfix later to maint).
575+
(merge de9f7fa3b0 rs/commit-pptr-simplify later to maint).
576+
(merge 4259d693fc sc/fmt-merge-msg-doc-markup-fix later to maint).
577+
(merge 28fab7b23d nd/test-helpers 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.10.0.GIT
4+
DEF_VER=v2.11.0-rc0
55

66
LF='
77
'

0 commit comments

Comments
 (0)