What's cooking (2014/11 #01)

Junio C Hamano committed Nov 5, 2014 at 13:40 UTC 9180ab4467bab2dbc2d23ab4d8344bb024586b91
1 file changed +60 -150
whats-cooking.txt
+60 -150
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Oct 2014, #08; Fri, 31)
4 -X-master-at: 4ace7ff4557350b7e0b57d024a2ea311b332e01d
5 -X-next-at: 35ae3ef5b2d45986e7e641c2f39b5c87b24ead08
3 +Subject: What's cooking in git.git (Nov 2014, #01; Wed, 5)
4 +X-master-at: f745acb028ee8f7dcd1c8f10127b8feeaa255cf7
5 +X-next-at: e7f43d631f3874d59f665b70a7bf5ea08e113c3b
6
7 -What's cooking in git.git (Oct 2014, #08; Fri, 31)
7 +What's cooking in git.git (Nov 2014, #01; Wed, 5)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -17,124 +17,58 @@ of the repositories listed at
17 http://git-blame.blogspot.com/p/git-public-repositories.html
18
19 --------------------------------------------------
20 -[Graduated to "master"]
21 -
22 -* bc/asciidoctor (2014-10-27) 4 commits
23 - (merged to 'next' on 2014-10-28 at a5b6349)
24 - + Documentation: remove Asciidoctor linkgit macro
25 - + Documentation: refactor common operations into variables
26 - (merged to 'next' on 2014-10-17 at 12ce2e2)
27 - + Documentation: implement linkgit macro for Asciidoctor
28 - + Documentation: move some AsciiDoc parameters into variables
29 -
30 - Add machinery to alternatively use AsciiDoctor to format our
31 - documentation.
32 -
33 -
34 -* da/difftool (2014-10-28) 2 commits
35 - (merged to 'next' on 2014-10-28 at 19da3f6)
36 - + difftool: add support for --trust-exit-code
37 - + difftool--helper: exit when reading a prompt answer fails
38 -
39 - Allow diff tool backend to stop early by exiting with a non-zero
40 - status.
41 -
42 -
43 -* dm/port2zos (2014-10-27) 3 commits
44 - (merged to 'next' on 2014-10-28 at d03d3ae)
45 - + compat/bswap.h: detect endianness from XL C compiler macros
46 - + Makefile: reorder linker flags in the git executable rule
47 - + git-compat-util.h: support variadic macros with the XL C compiler
48 -
49 - z/OS port.
50 -
20 +[New Topics]
21
52 -* jc/push-cert (2014-10-28) 1 commit
53 - (merged to 'next' on 2014-10-29 at d3ae2e4)
54 - + receive-pack: avoid minor leak in case start_async() fails
22 +* jk/fetch-reflog-df-conflict (2014-11-04) 2 commits
23 + (merged to 'next' on 2014-11-05 at b0476c9)
24 + + ignore stale directories when checking reflog existence
25 + + fetch: load all default config at startup
26
56 - Leakfix for a topic that is already in 'master'.
27 + Corner-case bugfixes for "git fetch" around reflog handling.
28
29 + Will merge to 'master'.
30
59 -* jk/prune-mtime (2014-10-19) 28 commits
60 - (merged to 'next' on 2014-10-20 at fdd7ff6)
61 - + drop add_object_array_with_mode
62 - + revision: remove definition of unused 'add_object' function
63 - + pack-objects: double-check options before discarding objects
64 - + repack: pack objects mentioned by the index
65 - + pack-objects: use argv_array
66 - + reachable: use revision machinery's --indexed-objects code
67 - + rev-list: add --indexed-objects option
68 - + rev-list: document --reflog option
69 - + t5516: test pushing a tag of an otherwise unreferenced blob
70 - + traverse_commit_list: support pending blobs/trees with paths
71 - + make add_object_array_with_context interface more sane
72 - + write_sha1_file: freshen existing objects
73 - + pack-objects: match prune logic for discarding objects
74 - + pack-objects: refactor unpack-unreachable expiration check
75 - + prune: keep objects reachable from recent objects
76 - + sha1_file: add for_each iterators for loose and packed objects
77 - + count-objects: use for_each_loose_file_in_objdir
78 - + count-objects: do not use xsize_t when counting object size
79 - + prune-packed: use for_each_loose_file_in_objdir
80 - + reachable: mark index blobs as SEEN
81 - + prune: factor out loose-object directory traversal
82 - + reachable: reuse revision.c "add all reflogs" code
83 - + reachable: use traverse_commit_list instead of custom walk
84 - + clean up name allocation in prepare_revision_walk
85 - + object_array: add a "clear" function
86 - + object_array: factor out slopbuf-freeing logic
87 - + isxdigit: cast input to unsigned char
88 - + foreach_alt_odb: propagate return value from callback
31
90 - Tighten the logic to decide that an unreachable cruft is
91 - sufficiently old by covering corner cases such as an ancient object
92 - becoming reachable and then going unreachable again, in which case
93 - its retention period should be prolonged.
32 +* js/diff-highlight-avoid-sigpipe (2014-11-04) 1 commit
33 + (merged to 'next' on 2014-11-05 at b0fadd3)
34 + + diff-highlight: exit when a pipe is broken
35
36 + Will merge to 'master'.
37
96 -* mg/lib-gpg-ro-safety (2014-10-27) 1 commit
97 - (merged to 'next' on 2014-10-28 at f396990)
98 - + t/lib-gpg: make gpghome files writable
38
100 - In a tarball extract whose files are all read-only, running GPG
101 - tests would have failed due to unwritable files.
39 +* ms/submodule-update-config-doc (2014-11-03) 1 commit
40 + - submodule: clarify documentation for update subcommand
41
42
104 -* oc/mergetools-beyondcompare (2014-10-21) 1 commit
105 - (merged to 'next' on 2014-10-24 at e9278e8)
106 - + mergetool: rename bc3 to bc
43 +* nd/lockfile-absolute (2014-11-03) 1 commit
44 + - lockfile.c: store absolute path
45
108 - Take --tool=bc for both BeyondCompare version 3 and 4.
46 + The lockfile API can get confused which file to clean up when the
47 + process moved the $cwd after creating a lockfile.
48
49 + Will merge to 'next' and cook throughout the remainder of the cycle.
50
111 -* rb/pack-window-memory-config-doc (2014-10-28) 1 commit
112 - (merged to 'next' on 2014-10-28 at fc74359)
113 - + config.txt: pack.windowmemory limit applies per-thread
51
52 +* tm/line-log-first-parent (2014-11-04) 1 commit
53 + (merged to 'next' on 2014-11-05 at 8a6f650)
54 + + line-log: fix crash when --first-parent is used
55
116 -* rs/child-process-init (2014-10-28) 1 commit
117 - (merged to 'next' on 2014-10-29 at 21a76a2)
118 - + api-run-command: add missing list item marker
56 + "git log --first-parent -L..." used to crash.
57
58 + Will merge to 'master'.
59
121 -* rs/grep-color-words (2014-10-28) 1 commit
122 - (merged to 'next' on 2014-10-28 at 4e6659d)
123 - + grep: add color.grep.matchcontext and color.grep.matchselected
60
125 - Allow painting or not painting (partial) matches in context lines
126 - when showing "grep -C<num>" output in color.
61 +* jh/empty-notes (2014-11-05) 3 commits
62 + - notes: add --allow-empty, to allow storing empty notes
63 + - t3312-notes-empty: test that 'git notes' removes empty notes by default
64 + - builtin/notes: fix premature failure when trying to add the empty blob
65
128 ---------------------------------------------------
129 -[New Topics]
130 -
131 -* jc/merge-bases (2014-10-30) 2 commits
132 - - get_merge_bases(): always clean-up object flags
133 - - bisect: clean flags after checking merge bases
66
67 +* nd/gitignore-trailing-whitespace (2014-11-04) 1 commit
68 + (merged to 'next' on 2014-11-05 at e7f43d6)
69 + + gitignore.txt: fix spelling of "backslash"
70
136 -* jk/cache-tree-protect-from-broken-libgit2 (2014-10-30) 1 commit
137 - - cache-tree: avoid infinite loop on zero-entry tree
71 + Will merge to 'master'.
72
73 --------------------------------------------------
74 [Stalled]
@@ -336,6 +270,20 @@ of the repositories listed at
270 --------------------------------------------------
271 [Cooking]
272
273 +* jc/merge-bases (2014-10-30) 2 commits
274 + - get_merge_bases(): always clean-up object flags
275 + - bisect: clean flags after checking merge bases
276 +
277 + Will merge to 'next' and cook throughout the remainder of the cycle.
278 +
279 +
280 +* jk/cache-tree-protect-from-broken-libgit2 (2014-10-30) 1 commit
281 + (merged to 'next' on 2014-11-03 at 6ebd88d)
282 + + cache-tree: avoid infinite loop on zero-entry tree
283 +
284 + Will merge to 'master'.
285 +
286 +
287 * jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit
288 (merged to 'next' on 2014-10-29 at 9167582)
289 + strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines
@@ -370,12 +318,13 @@ of the repositories listed at
318
319
320 * rs/use-child-process-init-more (2014-10-30) 4 commits
373 - - bundle: split out ref writing from bundle_create
374 - - bundle: split out a helper function to compute and write prerequisites
375 - - bundle: split out a helper function to create pack data
376 - - use child_process_init() to initialize struct child_process variables
321 + (merged to 'next' on 2014-11-03 at a82d885)
322 + + bundle: split out ref writing from bundle_create
323 + + bundle: split out a helper function to compute and write prerequisites
324 + + bundle: split out a helper function to create pack data
325 + + use child_process_init() to initialize struct child_process variables
326
378 - Will merge to 'next'.
327 + Will merge to 'master'.
328
329
330 * zk/grep-color-words (2014-10-27) 2 commits
@@ -411,7 +360,7 @@ of the repositories listed at
360 Will cook in 'next' throughout the remainder of the cycle.
361
362
414 -* rs/ref-transaction-reflog (2014-10-22) 15 commits
363 +* rs/ref-transaction-reflog (2014-11-03) 15 commits
364 - refs.c: allow deleting refs with a broken sha1
365 - refs.c: remove lock_any_ref_for_update
366 - refs.c: make unlock_ref/close_ref/commit_ref static
@@ -432,7 +381,7 @@ of the repositories listed at
381 Reviews and comments?
382
383
435 -* rs/ref-transaction-rename (2014-10-22) 15 commits
384 +* rs/ref-transaction-rename (2014-11-03) 17 commits
385 - refs.c: add an err argument to pack_refs
386 - refs.c: make lock_packed_refs take an err argument
387 - refs.c: make add_packed_ref return an error instead of calling die
@@ -444,6 +393,8 @@ of the repositories listed at
393 - refs.c: move reflog updates into its own function
394 - refs.c: rollback the lockfile before we die() in repack_without_refs
395 - refs.c: update rename_ref to use a transaction
396 + - refs.c: add new function copy_reflog_into_strbuf
397 + - refs.c: add transaction support for replacing a reflog
398 - refs.c: use a stringlist for repack_without_refs
399 - refs.c: use packed refs when deleting refs during a transaction
400 - refs.c: return error instead of dying when locking fails during transaction
@@ -453,10 +404,9 @@ of the repositories listed at
404 Reviews and comments?
405
406
456 -* rs/ref-transaction-send-pack (2014-10-22) 8 commits
407 +* rs/ref-transaction-send-pack (2014-11-03) 7 commits
408 - refs.c: add an err argument to create_symref
409 - refs.c: add an err argument to create_reflog
459 - - receive-pack.c: add a receive.preferatomicpush configuration variable
410 - t5543-atomic-push.sh: add basic tests for atomic pushes
411 - push.c: add an --atomic-push argument
412 - receive-pack.c: use a single transaction when atomic-push is negotiated
@@ -485,43 +435,3 @@ of the repositories listed at
435 Allow "git clone --reference" to be used more safely.
436
437 Will cook in 'next' throughout the remainder of the cycle.
488 -
489 ---------------------------------------------------
490 -[Discarded]
491 -
492 -* jk/tag-contains (2014-06-30) 8 commits
493 - . perf: add tests for tag --contains
494 - . tag: use commit_contains
495 - . commit: provide a fast multi-tip contains function
496 - . string-list: add pos to iterator callback
497 - . add functions for memory-efficient bitmaps
498 - . paint_down_to_common: use prio_queue
499 - . tag: factor out decision to stream tags
500 - . tag: allow --sort with -n
501 -
502 - Expecting a reroll.
503 -
504 -
505 -* jk/makefile (2014-02-05) 16 commits
506 - . FIXUP
507 - . move LESS/LV pager environment to Makefile
508 - . Makefile: teach scripts to include make variables
509 - . FIXUP
510 - . Makefile: auto-build C strings from make variables
511 - . Makefile: drop *_SQ variables
512 - . FIXUP
513 - . Makefile: add c-quote helper function
514 - . Makefile: introduce sq function for shell-quoting
515 - . Makefile: always create files via make-var
516 - . Makefile: store GIT-* sentinel files in MAKE/
517 - . Makefile: prefer printf to echo for GIT-*
518 - . Makefile: use tempfile/mv strategy for GIT-*
519 - . Makefile: introduce make-var helper function
520 - . Makefile: fix git-instaweb dependency on gitweb
521 - . Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
522 -
523 - Simplify the Makefile rules and macros that exist primarily for
524 - quoting purposes, and make it easier to robustly express the
525 - dependency rules.
526 -
527 - Expecting a reroll.