Skip to content

Commit e510a86

Browse files
committed
Second batch for 2.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e6a51af commit e510a86

1 file changed

Lines changed: 25 additions & 0 deletions

File tree

Documentation/RelNotes/2.11.0.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ Performance, Internal Implementation, Development Support etc.
4444
script file "git am" internally uses.
4545
(merge a77598e jc/am-read-author-file later to maint).
4646

47+
* Lifts calls to exit(2) and die() higher in the callchain in
48+
sequencer.c files so that more helper functions in it can be used
49+
by callers that want to handle error conditions themselves.
50+
4751

4852
Also contains various documentation updates and code clean-ups.
4953

@@ -88,10 +92,31 @@ notes for details).
8892
newer GIT_TRACE_CURL.
8993
(merge 14e2411 ep/use-git-trace-curl-in-tests later to maint).
9094

95+
* "git pack-objects --include-tag" was taught that when we know that
96+
we are sending an object C, we want a tag B that directly points at
97+
C but also a tag A that points at the tag B. We used to miss the
98+
intermediate tag B in some cases.
99+
(merge b773dde jk/pack-tag-of-tag later to maint).
100+
101+
* Update Japanese translation for "git-gui".
102+
(merge 02748bc sy/git-gui-i18n-ja later to maint).
103+
104+
* "git fetch http::/site/path" did not die correctly and segfaulted
105+
instead.
106+
(merge d63ed6e jk/fix-remote-curl-url-wo-proto later to maint).
107+
108+
* "git commit-tree" stopped reading commit.gpgsign configuration
109+
variable that was meant for Porcelain "git commit" in Git 2.9; we
110+
forgot to update "git gui" to look at the configuration to match
111+
this change.
112+
(merge f14a310 js/git-gui-commit-gpgsign later to maint).
113+
91114
* Other minor doc, test and build updates and code cleanups.
92115
(merge 3e1952e jk/squelch-false-warning-from-gcc-o3 later to maint).
93116
(merge ca2baa3 rs/compat-strdup later to maint).
94117
(merge d233097 rs/hex2chr later to maint).
95118
(merge c00bfc9 js/t9903-chaining later to maint).
96119
(merge 5e4e5bb sb/xdiff-remove-unused-static-decl later to maint).
97120
(merge 5cb5fe4 sb/transport-report-missing-submodule-on-stderr later to maint).
121+
(merge a1c8044 ah/misc-message-fixes later to maint).
122+
(merge ca9b37e sb/diff-cleanup later to maint).

0 commit comments

Comments
 (0)