@matheusbsbs / matheus-bagliano / commits / 818f89aa0b

What's cooking (2018/12 #02)

Junio C Hamano committed Dec 28, 2018 at 10:01 UTC 818f89aa0be44f5aded2ce9e9a52a550266f9cdc
1 file changed +243 -183
whats-cooking.txt
+243 -183
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Dec 2018, #01; Sun, 9)
4 -X-master-at: 5d826e972970a784bd7a7bdf587512510097b8c7
5 -X-next-at: bc1bbc6f855c3b5ef7fcbd0f688f647c4e5b208b
3 +Subject: What's cooking in git.git (Dec 2018, #02; Fri, 28)
4 +X-master-at: b21ebb671bb7dea8d342225f0d66c41f4e54d5ca
5 +X-next-at: 81188d93c3fce477216ba905bd37ab453a74b11d
6
7 -What's cooking in git.git (Dec 2018, #01; Sun, 9)
7 +What's cooking in git.git (Dec 2018, #02; Fri, 28)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,16 @@ Here are the topics that have been cooking. Commits prefixed with
12 '+' are in 'next'. The ones marked with '.' do not appear in any of
13 the integration branches, but I am still holding onto them.
14
15 +The current state is that 'next' has been rewound, a few topics have
16 +been updated, and almost no new topics have been picked up (yet),
17 +even though many of them seem to have been reviewed on-list and I've
18 +also looked at some of them.
19 +
20 +Sorry for being slow to recover from the year-end slowness; the 2.20
21 +release being rather large-ish and needed brown-paper-bag fixes soon
22 +after it, my temporary trans-pacific migration, or me catching cold
23 +that I haven't shaken off, did not help X-<.
24 +
25 You can find the changes described here in the integration branches
26 of the repositories listed at
27
@@ -20,110 +30,157 @@ of the repositories listed at
30 --------------------------------------------------
31 [Graduated to "master"]
32
23 -* ab/push-example-in-doc (2018-11-14) 1 commit
24 - (merged to 'next' on 2018-11-18 at 8fd935a19c)
25 - + push: change needlessly ambiguous example in error
26 -
27 - An error message that sugggests how to give correct arguments to
28 - "git push" has been updated.
29 -
33 +* ds/hash-independent-tests-fix (2018-12-12) 1 commit
34 + + .gitattributes: ensure t/oid-info/* has eol=lf
35
31 -* ab/replace-graft-with-replace-advice (2018-11-29) 1 commit
32 - (merged to 'next' on 2018-11-30 at c5d658e075)
33 - + advice: don't pointlessly suggest --convert-graft-file
36 + Test portability fix.
37
35 - The advice message to tell the user to migrate an existing graft
36 - file to the replace system when a graft file was read was shown
37 - even when "git replace --convert-graft-file" command, which is the
38 - way the message suggests to use, was running, which made little
39 - sense.
38
39 +* jc/run-command-report-exec-failure-fix (2018-12-12) 1 commit
40 + + run-command: report exec failure
41
42 -* gh/diff-raw-has-no-ellipses (2018-11-26) 1 commit
43 - (merged to 'next' on 2018-11-29 at 24a7536f15)
44 - + doc: update diff-format.txt for removed ellipses in --raw
42 + A recent update accidentally squelched an error message when the
43 + run_command API failed to run a missing command, which has been
44 + corrected.
45
46 - "git diff --raw" lost ellipses to adjust the output columns for
47 - some time now, but the documentation still showed them.
46
47 +* js/help-commands-verbose-by-default-fix (2018-12-12) 2 commits
48 + + help -a: handle aliases with long names gracefully
49 + + help.h: fix coding style
50
50 -* jc/format-patch-range-diff-fix (2018-11-30) 1 commit
51 - (merged to 'next' on 2018-11-30 at 26290b1ec1)
52 - + format-patch: do not let its diff-options affect --range-diff
51 + "git help -a" did not work well when an overly long alias is
52 + defined, which has been corrected.
53
54 - "git format-patch --range-diff" by mistake passed the diff options
55 - used to generate the primary output of the command to the
56 - range-diff machinery, which caused the range-diff in the cover
57 - letter to include fairly useless "--stat" output. This has been
58 - corrected by forcing a non-customizable default formatting options
59 - on the range-diff machinery when driven by format-patch.
54
55 +* js/mailinfo-format-flowed-fix (2018-12-13) 1 commit
56 + + t4256: mark support files as LF-only
57
62 -* js/rebase-reflog-action-fix (2018-11-30) 1 commit
63 - (merged to 'next' on 2018-11-30 at 93fd2fb920)
64 - + rebase: fix GIT_REFLOG_ACTION regression
58 + Test portability fix.
59
66 - "git rebase" reimplemented recently in C accidentally changed the
67 - way reflog entries are recorded (earlier "rebase -i" identified the
68 - entries it leaves with "rebase -i", but the new version always
69 - marks them with "rebase"). This has been corrected.
60
61 +* nd/show-gitcomp-compilation-fix (2018-12-12) 1 commit
62 + + parse-options: fix SunCC compiler warning
63
72 -* js/rebase-stat-unrelated-fix (2018-11-30) 1 commit
73 - (merged to 'next' on 2018-11-30 at a9faaff8c1)
74 - + rebase --stat: fix when rebasing to an unrelated history
64 + Portability fix for a recent update to parse-options API.
65
76 - "git rebase --stat" to transplant a piece of history onto a totally
77 - unrelated history were not working before and silently showed wrong
78 - result. With the recent reimplementation in C, it started to instead
79 - die with an error message, as the original logic was not prepared
80 - to cope with this case. This has now been fixed.
81 -
82 -
83 -* ma/reset-doc-rendering-fix (2018-11-29) 2 commits
84 - (merged to 'next' on 2018-11-30 at be718c19e2)
85 - + git-reset.txt: render literal examples as monospace
86 - + git-reset.txt: render tables correctly under Asciidoctor
66 +--------------------------------------------------
67 +[New Topics]
68
88 - Doc updates.
69 +* ds/midx-expire-repack (2018-12-11) 5 commits
70 + - multi-pack-index: implement midx_repack()
71 + - multi-pack-index: prepare 'repack' verb
72 + - multi-pack-index: implement 'expire' verb
73 + - multi-pack-index: refactor permutation logic
74 + - multi-pack-index: prepare for 'expire' verb
75 +
76 +
77 +* ds/push-sparse-tree-walk (2018-12-11) 6 commits
78 + - pack-objects: create GIT_TEST_PACK_SPARSE
79 + - pack-objects: create pack.useSparse setting
80 + - revision: implement sparse algorithm
81 + - pack-objects: add --sparse option
82 + - list-objects: consume sparse tree walk
83 + - revision: add mark_tree_uninteresting_sparse
84 +
85 +
86 +* js/rebase-i-redo-exec (2018-12-11) 3 commits
87 + - rebase: introduce a shortcut for --reschedule-failed-exec
88 + - rebase: add a config option to default to --reschedule-failed-exec
89 + - rebase: introduce --reschedule-failed-exec
90 +
91 +
92 +* md/list-objects-filter-by-depth (2018-12-11) 4 commits
93 + - tree:<depth>: skip some trees even when collecting omits
94 + - list-objects-filter: teach tree:# how to handle >0
95 + - Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
96 + - Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth
97 + (this branch uses nd/the-index and sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.)
98 +
99 + Needs to be rebuilt when sb/more-repo-in-api is rewound.
100 +
101 +
102 +* nd/backup-log (2018-12-10) 24 commits
103 + - FIXME
104 + - rebase: keep backup of overwritten files on --skip or --abort
105 + - am: keep backup of overwritten files on --skip or --abort
106 + - checkout -f: keep backup of overwritten files
107 + - reset --hard: keep backup of overwritten files
108 + - unpack-trees.c: keep backup of ignored files being overwritten
109 + - refs: keep backup of deleted reflog
110 + - config --edit: support backup log
111 + - sha1-file.c: let index_path() accept NULL istate
112 + - backup-log: keep all blob references around
113 + - gc: prune backup logs
114 + - backup-log: add prune command
115 + - backup-log: add log command
116 + - backup-log: add diff command
117 + - backup-log: add cat command
118 + - backup-log.c: add API for walking backup log
119 + - add--interactive: support backup log
120 + - apply: support backup log with --keep-backup
121 + - commit: support backup log
122 + - update-index: support backup log with --keep-backup
123 + - add: support backup log
124 + - read-cache.c: new flag for add_index_entry() to write to backup log
125 + - backup-log: add "update" subcommand
126 + - doc: introduce new "backup log" concept
127 +
128 +
129 +* nd/style-opening-brace (2018-12-10) 1 commit
130 + - style: the opening '{' of a function is in a separate line
131
132 + Code clean-up.
133
91 -* rt/rebase-in-c-message-fix (2018-12-01) 1 commit
92 - (merged to 'next' on 2018-12-01 at 4428c15a66)
93 - + builtin/rebase.c: remove superfluous space in messages
134
135 +* sg/stress-test (2018-12-10) 8 commits
136 + - fixup! test-lib: add the '--stress' option to run a test repeatedly under load
137 + - test-lib: add the '--stress' option to run a test repeatedly under load
138 + - test-lib-functions: introduce the 'test_set_port' helper function
139 + - test-lib: extract Bash version check for '-x' tracing
140 + - test-lib: set $TRASH_DIRECTORY earlier
141 + - test-lib: consolidate naming of test-results paths
142 + - test-lib: parse some --options earlier
143 + - test-lib: translate SIGTERM and SIGHUP to an exit
144
96 -* sg/daemon-test-signal-fix (2018-11-27) 1 commit
97 - (merged to 'next' on 2018-11-30 at b3f7fdf727)
98 - + t/lib-git-daemon: fix signal checking
145
100 - Test fix.
146 +* tg/checkout-no-overlay (2018-12-10) 8 commits
147 + - stash: use git checkout --no-overlay
148 + - checkout: allow ignoring unmatched pathspec
149 + - checkout: add --cached option
150 + - checkout: introduce --{,no-}overlay option
151 + - read-cache: add invalidate parameter to remove_marked_cache_entries
152 + - entry: support CE_WT_REMOVE flag in checkout_entry
153 + - entry: factor out unlink_entry function
154 + - move worktree tests to t24*
155
156
103 -* sg/test-BUG (2018-11-20) 1 commit
104 - (merged to 'next' on 2018-11-21 at bb81013952)
105 - + tests: send "bug in the test script" errors to the script's stderr
157 +* jk/proto-v2-hidden-refs-fix (2018-12-14) 3 commits
158 + - upload-pack: support hidden refs with protocol v2
159 + - parse_hide_refs_config: handle NULL section
160 + - serve: pass "config context" through to individual commands
161
107 - test framework has been updated to make a bug in the test script
108 - (as opposed to bugs in Git that are discovered by running the
109 - tests) stand out more prominently.
162
163 +* la/quiltimport-keep-non-patch (2018-12-14) 1 commit
164 + - git-quiltimport: Add --keep-non-patch option
165
112 -* sg/test-cmp-rev (2018-11-20) 1 commit
113 - (merged to 'next' on 2018-11-21 at 5d65cb2a76)
114 - + test-lib-functions: make 'test_cmp_rev' more informative on failure
166
116 - Test framework update.
167 +* sb/submodule-fetchjobs-default-to-one (2018-12-14) 1 commit
168 + - submodule update: run at most one fetch job unless otherwise set
169
170 +--------------------------------------------------
171 +[Stalled]
172
119 -* ss/msvc-strcasecmp (2018-11-20) 1 commit
120 - (merged to 'next' on 2018-11-21 at 9e45649e6e)
121 - + msvc: directly use MS version (_stricmp) of strcasecmp
173 +* lt/date-human (2018-07-09) 1 commit
174 + - Add 'human' date format
175
123 - MSVC update.
176 + A new date format "--date=human" that morphs its output depending
177 + on how far the time is from the current time has been introduced.
178 + "--date=auto" can be used to use this new format when the output is
179 + goint to the pager or to the terminal and otherwise the default
180 + format.
181
182 --------------------------------------------------
126 -[New Topics]
183 +[Cooking]
184
185 * cb/openbsd-allows-reading-directory (2018-12-03) 1 commit
186 - config.mak.uname: OpenBSD uses BSD semantics with fread for directories
@@ -169,8 +226,7 @@ of the repositories listed at
226 Will merge to 'next'.
227
228
172 -* js/commit-graph-chunk-table-fix (2018-12-09) 4 commits
173 - - SQUASH???
229 +* js/commit-graph-chunk-table-fix (2018-12-14) 3 commits
230 - Makefile: correct example fuzz build
231 - commit-graph: fix buffer read-overflow
232 - commit-graph, fuzz: add fuzzer for commit-graph
@@ -181,12 +237,12 @@ of the repositories listed at
237
238 * jt/get-reference-with-commit-graph (2018-12-06) 1 commit
239 - revision: use commit graph in get_reference()
184 - (this branch uses sb/more-repo-in-api.)
240 + (this branch uses sb/more-repo-in-api; is tangled with md/list-objects-filter-by-depth.)
241
242 Micro-optimize the code that prepares commit objects to be walked
243 by "git rev-list" when the commit-graph is available.
244
189 - Will merge to 'next'.
245 + Needs to be rebuilt when sb/more-repo-in-api is rewound.
246
247
248 * md/exclude-promisor-objects-fix-cleanup (2018-12-06) 1 commit
@@ -198,7 +254,7 @@ of the repositories listed at
254
255
256 * bw/mailmap (2018-12-09) 1 commit
201 - - mailmap: update Brandon Williams's email address
257 + - mailmap: update brandon williams's email address
258
259 Will merge to 'next'.
260
@@ -227,7 +283,7 @@ of the repositories listed at
283 Will merge to 'next'.
284
285
230 -* km/rebase-doc-typofix (2018-12-09) 1 commit
286 +* km/rebase-doc-typofix (2018-12-10) 1 commit
287 - rebase docs: drop stray word in merge command description
288
289 Doc update.
@@ -243,40 +299,28 @@ of the repositories listed at
299 Will merge to 'next'.
300
301
246 -* tb/use-common-win32-pathfuncs-on-cygwin (2018-12-09) 1 commit
302 +* tb/use-common-win32-pathfuncs-on-cygwin (2018-12-26) 1 commit
303 - git clone <url> C:\cygwin\home\USER\repo' is working (again)
304
305 Cygwin update.
306
307 Will merge to 'next'.
308
253 ---------------------------------------------------
254 -[Stalled]
255 -
256 -* lt/date-human (2018-07-09) 1 commit
257 - - Add 'human' date format
258 -
259 - A new date format "--date=human" that morphs its output depending
260 - on how far the time is from the current time has been introduced.
261 - "--date=auto" can be used to use this new format when the output is
262 - goint to the pager or to the terminal and otherwise the default
263 - format.
264 -
265 ---------------------------------------------------
266 -[Cooking]
309
310 * mk/http-backend-kill-children-before-exit (2018-11-26) 1 commit
269 - (merged to 'next' on 2018-11-29 at bf2d45062f)
311 + (merged to 'next' on 2018-12-28 at 81188d93c3)
312 + http-backend: enable cleaning up forked upload/receive-pack on exit
313
314 + Originally merged to 'next' on 2018-11-29
315 +
316 The http-backend CGI process did not correctly clean up the child
317 processes it spawns to run upload-pack etc. when it dies itself,
318 which has been corrected.
319
276 - Will cook in 'next'.
320 + Will merge to 'master'.
321
322
279 -* tb/log-G-binary (2018-11-29) 1 commit
323 +* tb/log-G-binary (2018-12-26) 1 commit
324 - log -G: ignore binary files
325
326 "git log -G<regex>" looked for a hunk in the "git log -p" patch
@@ -285,13 +329,12 @@ of the repositories listed at
329 not show any hunk that would match any pattern (unless textconv or
330 the --text option is in effect, that is).
331
288 - Expecting an update to the tests.
332 + Will merge to 'next'.
333
334
335 * dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits
292 - (merged to 'next' on 2018-11-21 at 217be06acb)
293 - + merge: add scissors line on merge conflict
294 - + t7600: clean up 'merge --squash c3 with c7' test
336 + - merge: add scissors line on merge conflict
337 + - t7600: clean up 'merge --squash c3 with c7' test
338
339 The list of conflicted paths shown in the editor while concluding a
340 conflicted merge was shown above the scissors line when the
@@ -299,7 +342,8 @@ of the repositories listed at
342 out just like the list of updated paths and other information to
343 help the user explain the merge better.
344
302 - Will cook in 'next'.
345 + Kicked out of 'next', to replace with a newer iteration.
346 + cf. <cover.1545745331.git.liu.denton@gmail.com>
347
348
349 * aw/pretty-trailers (2018-12-09) 7 commits
@@ -349,7 +393,7 @@ of the repositories listed at
393
394
395 * en/fast-export-import (2018-11-17) 11 commits
352 - (merged to 'next' on 2018-11-18 at 87bbbffc95)
396 + (merged to 'next' on 2018-12-28 at a1b09cf515)
397 + fast-export: add a --show-original-ids option to show original names
398 + fast-import: remove unmaintained duplicate documentation
399 + fast-export: add --reference-excluded-parents option
@@ -362,16 +406,20 @@ of the repositories listed at
406 + git-fast-import.txt: fix documentation for --quiet option
407 + fast-export: convert sha1 to oid
408
409 + Originally merged to 'next' on 2018-11-18
410 +
411 Small fixes and features for fast-export and fast-import, mostly on
412 the fast-export side.
413
368 - Will cook in 'next'.
414 + Will merge to 'master'.
415
416
417 * nd/checkout-dwim-fix (2018-11-14) 1 commit
372 - (merged to 'next' on 2018-11-18 at 3d714e7719)
418 + (merged to 'next' on 2018-12-28 at 3183c9305b)
419 + checkout: disambiguate dwim tracking branches and local files
420
421 + Originally merged to 'next' on 2018-11-18
422 +
423 "git checkout frotz" (without any double-dash) avoids ambiguity by
424 making sure 'frotz' cannot be interpreted as a revision and as a
425 path at the same time. This safety has been updated to check also
@@ -379,7 +427,7 @@ of the repositories listed at
427 to create a local branch 'frotz' out of a remote-tracking branch
428 'frotz' from a remote.
429
382 - Will cook in 'next'.
430 + Will merge to 'master'.
431
432
433 * nd/checkout-noisy (2018-11-20) 2 commits
@@ -395,15 +443,17 @@ of the repositories listed at
443
444
445 * sg/clone-initial-fetch-configuration (2018-11-16) 3 commits
398 - (merged to 'next' on 2018-11-18 at cae0f3985b)
446 + (merged to 'next' on 2018-12-28 at 82e104f221)
447 + Documentation/clone: document ignored configuration variables
448 + clone: respect additional configured fetch refspecs during initial fetch
449 + clone: use a more appropriate variable name for the default refspec
450
451 + Originally merged to 'next' on 2018-11-18
452 +
453 Refspecs configured with "git -c var=val clone" did not propagate
454 to the resulting repository, which has been corrected.
455
406 - Will cook in 'next'.
456 + Will merge to 'master'.
457
458
459 * en/rebase-merge-on-sequencer (2018-11-08) 2 commits
@@ -418,17 +468,19 @@ of the repositories listed at
468
469
470 * fc/http-version (2018-11-09) 1 commit
421 - (merged to 'next' on 2018-11-18 at 42f5155095)
471 + (merged to 'next' on 2018-12-28 at 56bcbb0fa9)
472 + http: add support selecting http version
473
474 + Originally merged to 'next' on 2018-11-18
475 +
476 The "http.version" configuration variable can be used with recent
477 enough cURL library to force the version of HTTP used to talk when
478 fetching and pushing.
479
428 - Will cook in 'next'.
480 + Will merge to 'master'.
481
482
431 -* dl/remote-save-to-push (2018-11-13) 1 commit
483 +* dl/remote-save-to-push (2018-12-11) 1 commit
484 - remote: add --save-to-push option to git remote set-url
485
486 "git remote set-url" learned a new option that moves existing value
@@ -439,9 +491,8 @@ of the repositories listed at
491
492
493 * jk/loose-object-cache (2018-11-24) 10 commits
442 - (merged to 'next' on 2018-11-24 at 5f4f22707d)
494 + (merged to 'next' on 2018-12-28 at 5a5faf384e)
495 + odb_load_loose_cache: fix strbuf leak
444 - (merged to 'next' on 2018-11-18 at 276691a21b)
496 + fetch-pack: drop custom loose object cache
497 + sha1-file: use loose object cache for quick existence check
498 + object-store: provide helpers for loose_objects_cache
@@ -452,10 +503,12 @@ of the repositories listed at
503 + submodule--helper: prefer strip_suffix() to ends_with()
504 + fsck: do not reuse child_process structs
505
506 + Originally merged to 'next' on 2018-11-24
507 +
508 Code clean-up with optimization for the codepath that checks
509 (non-)existence of loose objects.
510
458 - Will cook in 'next'.
511 + Will merge to 'master'.
512
513
514 * js/protocol-advertise-multi (2018-11-17) 1 commit
@@ -466,19 +519,20 @@ of the repositories listed at
519 listing the protocol versions it is willing to talk, and the other
520 side choosing from one of them.
521
469 - How's the doneness of this one?
522 + Expecting a reroll.
523 + cf. <20181218230514.GH37614@google.com>
524
525
472 -* js/smart-http-detect-remote-error (2018-11-17) 3 commits
473 - (merged to 'next' on 2018-11-18 at 5c6edfcb85)
474 - + remote-curl: die on server-side errors
475 - + remote-curl: tighten "version 2" check for smart-http
476 - + remote-curl: refactor smart-http discovery
526 +* js/smart-http-detect-remote-error (2018-12-12) 4 commits
527 + - lib-httpd, t5551: check server-side HTTP errors
528 + - remote-curl: tighten "version 2" check for smart-http
529 + - remote-curl: refactor smart-http discovery
530 + - pack-protocol.txt: accept error packets in any context
531
532 Some errors from the other side coming over smart HTTP transport
533 were not noticed, which has been corrected.
534
481 - Will cook in 'next'.
535 + Will merge to 'next'.
536
537
538 * nb/branch-show-other-worktrees-head (2018-11-12) 2 commits
@@ -494,7 +548,7 @@ of the repositories listed at
548
549
550 * nd/the-index (2018-11-12) 22 commits
497 - (merged to 'next' on 2018-11-18 at 73d1d8594e)
551 + (merged to 'next' on 2018-12-28 at 6bbd3befbe)
552 + rebase-interactive.c: remove the_repository references
553 + rerere.c: remove the_repository references
554 + pack-*.c: remove the_repository references
@@ -517,28 +571,30 @@ of the repositories listed at
571 + list-objects-filter.c: remove implicit dependency on the_index
572 + wt-status.c: remove implicit dependency the_repository
573 + wt-status.c: remove implicit dependency on the_index
574 + (this branch is used by md/list-objects-filter-by-depth.)
575 +
576 + Originally merged to 'next' on 2018-11-18
577
578 More codepaths become aware of working with in-core repository
579 instance other than the default "the_repository".
580
524 - Will cook in 'next'.
581 + Will merge to 'master'.
582
583
584 * ot/ref-filter-object-info (2018-11-24) 6 commits
528 - (merged to 'next' on 2018-11-24 at f8505762e3)
529 - + ref-filter: replace unportable `%lld` format with %PRIdMAX
530 - (merged to 'next' on 2018-11-18 at ad4c086678)
531 - + ref-filter: add docs for new options
532 - + ref-filter: add tests for deltabase
533 - + ref-filter: add deltabase option
534 - + ref-filter: add tests for objectsize:disk
535 - + ref-filter: add objectsize:disk option
585 + - ref-filter: replace unportable `%lld` format with %PRIdMAX
586 + - ref-filter: add docs for new options
587 + - ref-filter: add tests for deltabase
588 + - ref-filter: add deltabase option
589 + - ref-filter: add tests for objectsize:disk
590 + - ref-filter: add objectsize:disk option
591
592 The "--format=<placeholder>" option of for-each-ref, branch and tag
593 learned to show a few more traits of objects that can be learned by
594 the object_info API.
595
541 - Will cook in 'next'.
596 + Kicked out of 'next'; will replace with a reroll.
597 + cf. <01020167e063687c-37a43a09-0a5f-4335-8c21-ec15a0a67882-000000@eu-west-1.amazonses.com>
598
599
600 * sb/diff-color-moved-config-option-fixup (2018-11-14) 1 commit
@@ -550,7 +606,7 @@ of the repositories listed at
606
607
608 * ab/push-dwim-dst (2018-11-14) 7 commits
553 - (merged to 'next' on 2018-11-18 at 36567023be)
609 + (merged to 'next' on 2018-12-28 at d9f618de10)
610 + push doc: document the DWYM behavior pushing to unqualified <dst>
611 + push: test that <src> doesn't DWYM if <dst> is unqualified
612 + push: add an advice on unqualified <dst> push
@@ -559,6 +615,8 @@ of the repositories listed at
615 + i18n: remote.c: mark error(...) messages for translation
616 + remote.c: add braces in anticipation of a follow-up change
617
618 + Originally merged to 'next' on 2018-11-18
619 +
620 "git push $there $src:$dst" rejects when $dst is not a fully
621 qualified refname and not clear what the end user meant. The
622 codepath has been taught to give a clearer error message, and also
@@ -566,7 +624,7 @@ of the repositories listed at
624 object into account (e.g. a tag object would want to go under
625 refs/tags/).
626
569 - Will cook in 'next'.
627 + Will merge to 'master'.
628
629
630 * md/list-lazy-objects-fix (2018-12-06) 1 commit
@@ -580,7 +638,7 @@ of the repositories listed at
638
639
640 * nd/i18n (2018-11-12) 16 commits
583 - (merged to 'next' on 2018-11-18 at 5215bd2f7d)
641 + (merged to 'next' on 2018-12-28 at 8e2de8338e)
642 + fsck: mark strings for translation
643 + fsck: reduce word legos to help i18n
644 + parse-options.c: mark more strings for translation
@@ -598,48 +656,50 @@ of the repositories listed at
656 + alias.c: mark split_cmdline_strerror() strings for translation
657 + git.c: mark more strings for translation
658
659 + Originally merged to 'next' on 2018-11-18
660 +
661 More _("i18n") markings.
662
603 - Will cook in 'next'.
663 + Will merge to 'master'.
664
665
666 * sb/more-repo-in-api (2018-11-14) 23 commits
607 - (merged to 'next' on 2018-11-19 at e5d2a129da)
608 - + t/helper/test-repository: celebrate independence from the_repository
609 - + path.h: make REPO_GIT_PATH_FUNC repository agnostic
610 - + commit: prepare free_commit_buffer and release_commit_memory for any repo
611 - + commit-graph: convert remaining functions to handle any repo
612 - + submodule: don't add submodule as odb for push
613 - + submodule: use submodule repos for object lookup
614 - + pretty: prepare format_commit_message to handle arbitrary repositories
615 - + commit: prepare logmsg_reencode to handle arbitrary repositories
616 - + commit: prepare repo_unuse_commit_buffer to handle any repo
617 - + commit: prepare get_commit_buffer to handle any repo
618 - + commit-reach: prepare in_merge_bases[_many] to handle any repo
619 - + commit-reach: prepare get_merge_bases to handle any repo
620 - + commit-reach.c: allow get_merge_bases_many_0 to handle any repo
621 - + commit-reach.c: allow remove_redundant to handle any repo
622 - + commit-reach.c: allow merge_bases_many to handle any repo
623 - + commit-reach.c: allow paint_down_to_common to handle any repo
624 - + commit: allow parse_commit* to handle any repo
625 - + object: parse_object to honor its repository argument
626 - + object-store: prepare has_{sha1, object}_file to handle any repo
627 - + object-store: prepare read_object_file to deal with any repo
628 - + object-store: allow read_object_file_extended to read from any repo
629 - + packfile: allow has_packed_and_bad to handle arbitrary repositories
630 - + sha1_file: allow read_object to read objects in arbitrary repositories
631 - (this branch is used by jt/get-reference-with-commit-graph.)
667 + - t/helper/test-repository: celebrate independence from the_repository
668 + - path.h: make REPO_GIT_PATH_FUNC repository agnostic
669 + - commit: prepare free_commit_buffer and release_commit_memory for any repo
670 + - commit-graph: convert remaining functions to handle any repo
671 + - submodule: don't add submodule as odb for push
672 + - submodule: use submodule repos for object lookup
673 + - pretty: prepare format_commit_message to handle arbitrary repositories
674 + - commit: prepare logmsg_reencode to handle arbitrary repositories
675 + - commit: prepare repo_unuse_commit_buffer to handle any repo
676 + - commit: prepare get_commit_buffer to handle any repo
677 + - commit-reach: prepare in_merge_bases[_many] to handle any repo
678 + - commit-reach: prepare get_merge_bases to handle any repo
679 + - commit-reach.c: allow get_merge_bases_many_0 to handle any repo
680 + - commit-reach.c: allow remove_redundant to handle any repo
681 + - commit-reach.c: allow merge_bases_many to handle any repo
682 + - commit-reach.c: allow paint_down_to_common to handle any repo
683 + - commit: allow parse_commit* to handle any repo
684 + - object: parse_object to honor its repository argument
685 + - object-store: prepare has_{sha1, object}_file to handle any repo
686 + - object-store: prepare read_object_file to deal with any repo
687 + - object-store: allow read_object_file_extended to read from any repo
688 + - packfile: allow has_packed_and_bad to handle arbitrary repositories
689 + - sha1_file: allow read_object to read objects in arbitrary repositories
690 + (this branch is used by jt/get-reference-with-commit-graph and md/list-objects-filter-by-depth.)
691 +
692 + Originally merged to 'next' on 2018-11-19
693
694 The in-core repository instances are passed through more codepaths.
695
635 - Will cook in 'next'.
636 - cf. <20181115221254.45373-1-jonathantanmy@google.com>
696 + Kicked out of 'next'; will replace with a reroll.
697 + cf. <20181215000942.46033-2-sbeller@google.com>
698
699
700 * en/merge-path-collision (2018-12-01) 11 commits
640 - (merged to 'next' on 2018-12-01 at 24492e61f1)
701 + (merged to 'next' on 2018-12-28 at b50d3eee25)
702 + t6036: avoid non-portable "cp -a"
642 - (merged to 'next' on 2018-11-18 at 3ec9286e0b)
703 + merge-recursive: combine error handling
704 + t6036, t6043: increase code coverage for file collision handling
705 + merge-recursive: improve rename/rename(1to2)/add[/add] handling
@@ -651,21 +711,25 @@ of the repositories listed at
711 + t6036, t6042: testcases for rename collision of already conflicting files
712 + t6042: add tests for consistency in file collision conflict handling
713
714 + Originally merged to 'next' on 2018-12-01
715 +
716 Updates for corner cases in merge-recursive.
717
656 - Will cook in 'next'.
718 + Will merge to 'master'.
719
720
721 * sd/stash-wo-user-name (2018-11-19) 1 commit
660 - (merged to 'next' on 2018-11-19 at 0838b091ea)
722 + (merged to 'next' on 2018-12-28 at 99197ef5a1)
723 + stash: tolerate missing user identity
724
725 + Originally merged to 'next' on 2018-11-19
726 +
727 A properly configured username/email is required under
728 user.useConfigOnly in order to create commits; now "git stash"
729 (even though it creates commit objects to represent stash entries)
730 command is excempt from the requirement.
731
668 - Will cook in 'next'.
732 + Will merge to 'master'.
733
734
735 * bc/sha-256 (2018-11-14) 12 commits
@@ -837,8 +901,7 @@ of the repositories listed at
901 [Discarded]
902
903 * ab/reject-alias-loop (2018-10-19) 1 commit
840 - (merged to 'next' on 2018-10-26 at bc213f1bef)
841 - + alias: detect loops in mixed execution mode
904 + . alias: detect loops in mixed execution mode
905
906 Two (or more) aliases that mutually refer to each other can form an
907 infinite loop; we now attempt to notice and stop.
@@ -855,11 +918,10 @@ of the repositories listed at
918
919
920 * js/remote-archive-v2 (2018-09-28) 4 commits
858 - (merged to 'next' on 2018-10-12 at 5f34377f60)
859 - + archive: allow archive over HTTP(S) with proto v2
860 - + archive: implement protocol v2 archive command
861 - + archive: use packet_reader for communications
862 - + archive: follow test standards around assertions
921 + . archive: allow archive over HTTP(S) with proto v2
922 + . archive: implement protocol v2 archive command
923 + . archive: use packet_reader for communications
924 + . archive: follow test standards around assertions
925
926 The original implementation of "git archive --remote" more or less
927 bypassed the transport layer and did not work over http(s). The
@@ -871,8 +933,7 @@ of the repositories listed at
933
934
935 * ab/format-patch-rangediff-not-stat (2018-11-24) 1 commit
874 - (merged to 'next' on 2018-11-26 at d9c84916b3)
875 - + format-patch: don't include --stat with --range-diff output
936 + . format-patch: don't include --stat with --range-diff output
937
938 The "--rangediff" option recently added to "format-patch"
939 interspersed a bogus and useless "--stat" information by mistake,
@@ -882,8 +943,7 @@ of the repositories listed at
943
944
945 * jc/postpone-rebase-in-c (2018-11-26) 1 commit
885 - (merged to 'next' on 2018-11-26 at c6ae45110f)
886 - + rebase: mark the C reimplementation as an experimental opt-in feature
946 + . rebase: mark the C reimplementation as an experimental opt-in feature
947
948 People seem to be still finding latent bugs in the "rebase in C"
949 reimplementation. For the upcoming release, use the scripted