@@ -51,7 +51,6 @@ UI, Workflows & Features
51
51
* Prepare for Git on-disk repository representation to undergo
52
52
backward incompatible changes by introducing a new repository
53
53
format version "1", with an extension mechanism.
54
- (merge 067fbd4 jk/repository-extension later to maint).
55
54
56
55
* "git worktree" learned a "list" subcommand.
57
56
@@ -98,7 +97,6 @@ Performance, Internal Implementation, Development Support etc.
98
97
clean-up tasks to be done in a shell variable, it should not be
99
98
used inside a subshell. Add a mechanism to allow 'bash' to catch
100
99
such uses, and fix the ones that were found.
101
- (merge 0968f12 jk/test-lint-forbid-when-finished-in-subshell later to maint).
102
100
103
101
* The debugging infrastructure for pkt-line based communication has
104
102
been improved to mark the side-band communication specifically.
@@ -120,7 +118,6 @@ Performance, Internal Implementation, Development Support etc.
120
118
* The internal stripspace() function has been moved to where it
121
119
logically belongs to, i.e. strbuf API, and the command line parser
122
120
of "git stripspace" has been updated to use the parse_options API.
123
- (merge bed4452 tk/stripspace later to maint).
124
121
125
122
* "git am" used to spawn "git mailinfo" via run_command() API once
126
123
per each patch, but learned to make a direct call to mailinfo()
@@ -180,157 +177,125 @@ notes for details).
180
177
(which is not a great UI element as they can only appear at the end
181
178
of the command line). Add notice to documentation of each and
182
179
every one of them.
183
- (merge 2b594bf mm/keyid-docs later to maint).
184
180
185
181
* "git blame --first-parent v1.0..v2.0" was not rejected but did not
186
182
limit the blame to commits on the first parent chain.
187
- (merge 95a4fb0 jk/blame-first-parent later to maint).
188
183
189
184
* "git subtree" (in contrib/) now can take whitespaces in the
190
185
pathnames, not only in the in-tree pathname but the name of the
191
- directory that the repository is in. (merge 5b6ab38
192
- as/subtree-with-spaces later to maint).
186
+ directory that the repository is in.
193
187
194
188
* The ssh transport, just like any other transport over the network,
195
189
did not clear GIT_* environment variables, but it is possible to
196
190
use SendEnv and AcceptEnv to leak them to the remote invocation of
197
191
Git, which is not a good idea at all. Explicitly clear them just
198
192
like we do for the local transport.
199
- (merge a48b409 jk/connect-clear-env later to maint).
200
193
201
194
* Correct "git p4 --detect-labels" so that it does not fail to create
202
195
a tag that points at a commit that is also being imported.
203
- (merge b43702a ld/p4-import-labels later to maint).
204
196
205
197
* The Makefile always runs the library archiver with hardcoded "crs"
206
198
options, which was inconvenient for exotic platforms on which
207
199
people want to use programs with totally different set of command
208
200
line options.
209
- (merge ac179b4 jw/make-arflags-customizable later to maint).
210
201
211
202
* Customization to change the behaviour with "make -w" and "make -s"
212
203
in our Makefile was broken when they were used together.
213
- (merge ef49e05 jk/make-findstring-makeflags-fix later to maint).
214
204
215
205
* Allocation related functions and stdio are unsafe things to call
216
206
inside a signal handler, and indeed killing the pager can cause
217
207
glibc to deadlock waiting on allocation mutex as our signal handler
218
208
tries to free() some data structures in wait_for_pager(). Reduce
219
209
these unsafe calls.
220
- (merge 507d780 ti/glibc-stdio-mutex-from-signal-handler later to maint).
221
210
222
211
* The way how --ref/--notes to specify the notes tree reference are
223
212
DWIMmed was not clearly documented.
224
- (merge e14c92e jk/notes-dwim-doc later to maint).
225
213
226
214
* "git gc" used to barf when a symbolic ref has gone dangling
227
215
(e.g. the branch that used to be your upstream's default when you
228
216
cloned from it is now gone, and you did "fetch --prune").
229
- (merge 14886b4 js/gc-with-stale-symref later to maint).
230
217
231
218
* "git clone --dissociate" runs a big "git repack" process at the
232
219
end, and it helps to close file descriptors that are open on the
233
220
packs and their idx files before doing so on filesystems that
234
221
cannot remove a file that is still open.
235
- (merge 786b150 js/clone-dissociate later to maint).
236
222
237
223
* Description of the "log.follow" configuration variable in "git log"
238
224
documentation is now also copied to "git config" documentation.
239
- (merge fd8d07e dt/log-follow-config later to maint).
240
225
241
226
* "git rebase -i" had a minor regression recently, which stopped
242
227
considering a line that begins with an indented '#' in its insn
243
228
sheet not a comment. Further, the code was still too picky on
244
229
Windows where CRLF left by the editor is turned into a trailing CR
245
230
on the line read via the "read" built-in command of bash. Both of
246
231
these issues are now fixed.
247
- (merge 39743cf gr/rebase-i-drop-warn later to maint).
248
232
249
233
* After "git checkout --detach", "git status" reported a fairly
250
234
useless "HEAD detached at HEAD", instead of saying at which exact
251
235
commit.
252
- (merge 0eb8548 mm/detach-at-HEAD-reflog later to maint).
253
236
254
237
* When "git send-email" wanted to talk over Net::SMTP::SSL,
255
238
Net::Cmd::datasend() did not like to be fed too many bytes at the
256
239
same time and failed to send messages. Send the payload one line
257
240
at a time to work around the problem.
258
- (merge f60c483 sa/send-email-smtp-batch-data-limit later to maint).
259
241
260
242
* When "git am" was rewritten as a built-in, it stopped paying
261
243
attention to user.signingkey, which was fixed.
262
- (merge 434c64d pt/am-builtin later to maint).
263
244
264
245
* It was not possible to use a repository-lookalike created by "git
265
246
worktree add" as a local source of "git clone".
266
- (merge d78db84 nd/clone-linked-checkout later to maint).
267
247
268
248
* On a case insensitive filesystems, setting GIT_WORK_TREE variable
269
249
using a random cases that does not agree with what the filesystem
270
250
thinks confused Git that it wasn't inside the working tree.
271
- (merge 63ec5e1 js/icase-wt-detection later to maint).
272
251
273
252
* Performance-measurement tests did not work without an installed Git.
274
- (merge 31cd128 sb/perf-without-installed-git later to maint).
275
253
276
254
* A test script for the HTTP service had a timing dependent bug,
277
255
which was fixed.
278
- (merge 362d8b6 sb/http-flaky-test-fix later to maint).
279
256
280
257
* There were some classes of errors that "git fsck" diagnosed to its
281
258
standard error that did not cause it to exit with non-zero status.
282
- (merge 122f76f jc/fsck-dropped-errors later to maint).
283
259
284
260
* Work around "git p4" failing when the P4 depot records the contents
285
261
in UTF-16 without UTF-16 BOM.
286
- (merge 1f5f390 ls/p4-translation-failure later to maint).
287
262
288
263
* When "git gc --auto" is backgrounded, its diagnosis message is
289
264
lost. Save it to a file in $GIT_DIR and show it next time the "gc
290
265
--auto" is run.
291
- (merge 329e6e8 nd/gc-auto-background-fix later to maint).
292
266
293
267
* The submodule code has been taught to work better with separate
294
268
work trees created via "git worktree add".
295
- (merge 11f9dd7 mk/submodule-gitdir-path later to maint).
296
269
297
270
* "git gc" is safe to run anytime only because it has the built-in
298
271
grace period to protect young objects. In order to run with no
299
272
grace period, the user must make sure that the repository is
300
273
quiescent.
301
- (merge fae1a90 jc/doc-gc-prune-now later to maint).
302
274
303
275
* A recent "filter-branch --msg-filter" broke skipping of the commit
304
276
object header, which is fixed.
305
- (merge a5a4b3f jk/filter-branch-use-of-sed-on-incomplete-line later to maint).
306
277
307
278
* The normalize_ceiling_entry() function does not muck with the end
308
279
of the path it accepts, and the real world callers do rely on that,
309
280
but a test insisted that the function drops a trailing slash.
310
- (merge b2a7123 rd/test-path-utils later to maint).
311
281
312
282
* A test for interaction between untracked cache and sparse checkout
313
283
added in Git 2.5 days were flaky.
314
- (merge 9b680fb dt/t7063-fix-flaky-test later to maint).
315
284
316
285
* A couple of commands still showed "[options]" in their usage string
317
286
to note where options should come on their command line, but we
318
287
spell that "[<options>]" in most places these days.
319
- (merge d96a031 rt/placeholder-in-usage later to maint).
320
288
321
289
* The synopsis text and the usage string of subcommands that read
322
290
list of things from the standard input are often shown as if they
323
291
only take input from a file on a filesystem, which was misleading.
324
- (merge 33e8fc8 jc/usage-stdin later to maint).
325
292
326
293
* "git am -3" had a small regression where it is aborted in its error
327
294
handling codepath when underlying merge-recursive failed in certain
328
295
ways, as it assumed that the internal call to merge-recursive will
329
296
never die, which is not the case (yet).
330
- (merge c63d4b2 jc/am-3-fallback-regression-fix later to maint).
331
297
332
298
* The linkage order of libraries was wrong in places around libcurl.
333
- (merge 7e91e8d rp/link-curl-before-ssl later to maint).
334
299
335
300
* The name-hash subsystem that is used to cope with case insensitive
336
301
filesystems keeps track of directories and their on-filesystem
@@ -340,48 +305,38 @@ notes for details).
340
305
cache entry was removed from the index, leading to use after free.
341
306
This was fixed by recording the path for each directory instead of
342
307
borrowing cache entries and restructuring the API somewhat.
343
- (merge 41284eb dt/name-hash-dir-entry-fix later to maint).
344
308
345
309
* "git merge-file" tried to signal how many conflicts it found, which
346
310
obviously would not work well when there are too many of them.
347
- (merge e34f802 jk/merge-file-exit-code later to maint).
348
311
349
312
* The error message from "git blame --contents --reverse" incorrectly
350
313
talked about "--contents --children".
351
- (merge 9526197 mk/blame-error-message later to maint).
352
314
353
315
* "git imap-send" did not compile well with older version of cURL library.
354
- (merge 71d9257 js/imap-send-curl-compilation-fix later to maint).
355
316
356
317
* Merging a branch that removes a path and another that changes the
357
318
mode bits on the same path should have conflicted at the path, but
358
319
it didn't and silently favoured the removal.
359
- (merge 72fac66 jk/delete-modechange-conflict later to maint).
360
320
361
321
* "git --literal-pathspecs add -u/-A" without any command line
362
322
argument misbehaved ever since Git 2.0.
363
- (merge 29abb33 jc/add-u-A-default-to-top later to maint).
364
323
365
324
* "git daemon" uses "run_command()" without "finish_command()", so it
366
325
needs to release resources itself, which it forgot to do.
367
- (merge b1b49ff rs/daemon-plug-child-leak later to maint).
368
326
369
327
* "git status --branch --short" accessed beyond the constant string
370
328
"HEAD", which has been corrected.
371
- (merge c72b49d rs/wt-status-detached-branch-fix later to maint).
372
329
373
330
* We peek objects from submodule's object store by linking it to the
374
331
list of alternate object databases, but the code to do so forgot to
375
332
correctly initialize the list.
376
- (merge 9a6e4f0 jk/initialization-fix-to-add-submodule-odb later to maint).
377
333
378
334
* The code to prepare the working tree side of temporary directory
379
335
for the "dir-diff" feature forgot that symbolic links need not be
380
336
copied (or symlinked) to the temporary area, as the code already
381
337
special cases and overwrites them. Besides, it was wrong to try
382
338
computing the object name of the target of symbolic link, which may
383
339
not even exist or may be a directory.
384
- (merge cfe2d4b da/difftool later to maint).
385
340
386
341
* A Range: request can be responded with a full response and when
387
342
asked properly libcurl knows how to strip the result down to the
@@ -390,16 +345,13 @@ notes for details).
390
345
391
346
* Having a leftover .idx file without corresponding .pack file in
392
347
the repository hurts performance; "git gc" learned to prune them.
393
- (merge 478f34d dk/gc-idx-wo-pack later to maint).
394
348
395
349
* Apple's common crypto implementation of SHA1_Update() does not take
396
350
more than 4GB at a time, and we now have a compile-time workaround
397
351
for it.
398
- (merge 001fd7a ad/sha1-update-chunked later to maint).
399
352
400
353
* Produce correct "dirty" marker for shell prompts, even when we
401
354
are on an orphan or an unborn branch.
402
- (merge c26f70c sg/bash-prompt-dirty-orphan later to maint).
403
355
404
356
* A build without NO_IPv6 used to use gethostbyname() when guessing
405
357
user's hostname, instead of getaddrinfo() that is used in other
@@ -412,20 +364,4 @@ notes for details).
412
364
413
365
* Code clean-up, minor fixes etc.
414
366
(merge 15ed07d jc/rerere later to maint).
415
- (merge e7a7401 pt/pull-builtin later to maint).
416
- (merge 29bc480 nd/ls-remote-does-not-have-u-option later to maint).
417
- (merge be510e0 jk/asciidoctor-section-heading-markup-fix later to maint).
418
- (merge 83e6bda tk/typofix-connect-unknown-proto-error later to maint).
419
- (merge a43eb67 tk/doc-interpret-trailers-grammo later to maint).
420
- (merge ba128e2 es/worktree-add-cleanup later to maint).
421
- (merge 44cd91e cc/quote-comments later to maint).
422
367
(merge 147875f sb/submodule-config-parse later to maint).
423
- (merge ae9f274 es/worktree-add later to maint).
424
- (merge 3b19dba jc/em-dash-in-doc later to maint).
425
- (merge f3f38c7 jc/everyday-markup later to maint).
426
- (merge 77d5f71 xf/user-manual-markup later to maint).
427
- (merge b2af482 xf/user-manual-ff later to maint).
428
- (merge e510ab8 rs/pop-commit later to maint).
429
- (merge fdcdb77 js/misc-fixes later to maint).
430
- (merge c949b00 rs/show-branch-argv-array later to maint).
431
- (merge 56a8aea nd/doc-check-ref-format-typo later to maint).
0 commit comments