What's cooking (2015/05 #08)
Junio C Hamano committed
May 29, 2015 at 13:56 UTC
edb72b0679eefd1b2407cfb1345308e92671887c
1 file changed
+183
-165
whats-cooking.txt
+183
-165
@@ -1,180 +1,117 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2015, #07; Tue, 26)
4
-X-master-at: fae46aa0ae5318bbb20f0ef871721bf49e292cea
5
-X-next-at: 37f085bb52bb507d786c36ae50951e460f4f15c7
3
+Subject: What's cooking in git.git (May 2015, #08; Fri, 29)
4
+X-master-at: 77bd3ea9f54f1584147b594abc04c26ca516d987
5
+X-next-at: 5f4350e90f9ad5b056aa42fe83b9262c702a5306
6
7
-What's cooking in git.git (May 2015, #07; Tue, 26)
7
+What's cooking in git.git (May 2015, #08; Fri, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The "untracked cache" series is in 'master' now. I do not use it
15
-personally, but it is meant to make life easier for those with large
16
-amount of untracked cruft in their working trees. Please try it out
17
-and report successes (and of course breakages, too).
18
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
24
---------------------------------------------------
25
-[Graduated to "master"]
26
-
27
-* jk/rerere-forget-check-enabled (2015-05-14) 1 commit
28
- (merged to 'next' on 2015-05-19 at bfe67dc)
29
- + rerere: exit silently on "forget" when rerere is disabled
30
-
31
- "git rerere forget" in a repository without rerere enabled gave a
32
- cryptic error message; it should be a silent no-op instead.
33
-
34
-
35
-* nd/untracked-cache (2015-03-12) 24 commits
36
- (merged to 'next' on 2015-05-19 at 26e619b)
37
- + git-status.txt: advertisement for untracked cache
38
- + untracked cache: guard and disable on system changes
39
- + mingw32: add uname()
40
- + t7063: tests for untracked cache
41
- + update-index: test the system before enabling untracked cache
42
- + update-index: manually enable or disable untracked cache
43
- + status: enable untracked cache
44
- + untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE
45
- + untracked cache: mark index dirty if untracked cache is updated
46
- + untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS
47
- + untracked cache: avoid racy timestamps
48
- + read-cache.c: split racy stat test to a separate function
49
- + untracked cache: invalidate at index addition or removal
50
- + untracked cache: load from UNTR index extension
51
- + untracked cache: save to an index extension
52
- + ewah: add convenient wrapper ewah_serialize_strbuf()
53
- + untracked cache: don't open non-existent .gitignore
54
- + untracked cache: mark what dirs should be recursed/saved
55
- + untracked cache: record/validate dir mtime and reuse cached output
56
- + untracked cache: make a wrapper around {open,read,close}dir()
57
- + untracked cache: invalidate dirs recursively if .gitignore changes
58
- + untracked cache: initial untracked cache validation
59
- + untracked cache: record .gitignore information and dir hierarchy
60
- + dir.c: optionally compute sha-1 of a .gitignore file
61
-
62
- Teach the index to optionally remember already seen untracked files
63
- to speed up "git status" in a working tree with tons of cruft.
64
-
65
-
66
-* pt/pull-ff-vs-merge-ff (2015-05-18) 2 commits
67
- (merged to 'next' on 2015-05-20 at 064a082)
68
- + pull: parse pull.ff as a bool or string
69
- + pull: make pull.ff=true override merge.ff
70
-
71
- The pull.ff configuration was supposed to override the merge.ff
72
- configuration, but it didn't.
73
-
74
-
75
-* pt/pull-log-n (2015-05-18) 1 commit
76
- (merged to 'next' on 2015-05-20 at db6ce78)
77
- + pull: handle --log=<n>
78
-
79
- "git pull --log" and "git pull --no-log" worked as expected, but
80
- "git pull --log=20" did not.
81
-
82
-
83
-* rs/plug-leak-in-pack-bitmaps (2015-05-19) 1 commit
84
- (merged to 'next' on 2015-05-20 at b70f647)
85
- + pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps
86
-
87
- The code to read pack-bitmap wanted to allocate a few hundred
88
- pointers to a structure, but by mistake allocated and leaked memory
89
- enough to hold that many actual structures. Correct the allocation
90
- size and also have it on stack, as it is small enough.
91
-
19
--------------------------------------------------
20
[New Topics]
21
95
-* ah/send-email-sendmail-alias (2015-05-25) 2 commits
96
- - t9001: write $HOME/, not ~/, to help shells without tilde expansion
97
- - send-email: add sendmail email aliases format
22
+* jc/diff-ws-error-highlight (2015-05-26) 4 commits
23
+ - diff.c: --ws-error-highlight=<kind> option
24
+ - diff.c: add emit_del_line() and emit_context_line()
25
+ - t4015: separate common setup and per-test expectation
26
+ - t4015: modernise style
27
99
- "git send-email" learned the alias file format used by the sendmail
100
- program (in an abbreviated form).
28
+ Allow whitespace breakages in deleted and context lines to be also
29
+ painted in the output.
30
102
- Reroll coming? What's queued is good enough?
31
+ Will merge to 'next'.
32
33
105
-* bc/object-id (2015-05-25) 56 commits
106
- (merged to 'next' on 2015-05-26 at 8d9f645)
107
- + struct ref_lock: convert old_sha1 member to object_id
108
- + warn_if_dangling_symref(): convert local variable "junk" to object_id
109
- + each_ref_fn_adapter(): remove adapter
110
- + rev_list_insert_ref(): remove unneeded arguments
111
- + rev_list_insert_ref_oid(): new function, taking an object_oid
112
- + mark_complete(): remove unneeded arguments
113
- + mark_complete_oid(): new function, taking an object_oid
114
- + clear_marks(): rewrite to take an object_id argument
115
- + mark_complete(): rewrite to take an object_id argument
116
- + send_ref(): convert local variable "peeled" to object_id
117
- + upload-pack: rewrite functions to take object_id arguments
118
- + find_symref(): convert local variable "unused" to object_id
119
- + find_symref(): rewrite to take an object_id argument
120
- + write_one_ref(): rewrite to take an object_id argument
121
- + write_refs_to_temp_dir(): convert local variable sha1 to object_id
122
- + submodule: rewrite to take an object_id argument
123
- + shallow: rewrite functions to take object_id arguments
124
- + handle_one_ref(): rewrite to take an object_id argument
125
- + add_info_ref(): rewrite to take an object_id argument
126
- + handle_one_reflog(): rewrite to take an object_id argument
127
- + register_replace_ref(): rewrite to take an object_id argument
128
- + remote: rewrite functions to take object_id arguments
129
- + add_one_ref(): rewrite to take an object_id argument
130
- + string_list_add_one_ref(): rewrite to take an object_id argument
131
- + add_ref_decoration(): convert local variable original_sha1 to object_id
132
- + add_ref_decoration(): rewrite to take an object_id argument
133
- + show_head_ref(): convert local variable "unused" to object_id
134
- + http-backend: rewrite to take an object_id argument
135
- + append_similar_ref(): rewrite to take an object_id argument
136
- + builtin/show-ref: rewrite to take an object_id argument
137
- + show_ref(): convert local variable peeled to object_id
138
- + builtin/show-ref: rewrite to use object_id
139
- + fsck: change functions to use object_id
140
- + cmd_show_branch(): fix error message
141
- + builtin/show-branch: rewrite functions to work with object_id
142
- + append_one_rev(): rewrite to work with object_id
143
- + builtin/show-branch: rewrite functions to take object_id arguments
144
- + append_matching_ref(): rewrite to take an object_id argument
145
- + show_reference(): rewrite to take an object_id argument
146
- + builtin/remote: rewrite functions to take object_id arguments
147
- + add_branch_for_removal(): don't set "util" field of string_list entries
148
- + add_branch_for_removal(): rewrite to take an object_id argument
149
- + builtin/reflog: rewrite ref functions to take an object_id argument
150
- + show_ref_cb(): rewrite to take an object_id argument
151
- + builtin/pack-objects: rewrite to take an object_id argument
152
- + name_ref(): rewrite to take an object_id argument
153
- + grab_single_ref(): rewrite to take an object_id argument
154
- + builtin/fetch: rewrite to take an object_id argument
155
- + get_name(): rewrite to take an object_id argument
156
- + add_pending_uninteresting_ref(): rewrite to take an object_id argument
157
- + append_ref(): rewrite to take an object_id argument
158
- + register_ref(): rewrite to take an object_id argument
159
- + handle_one_ref(): rewrite to take an object_id argument
160
- + builtin/rev-parse: rewrite to take an object_id argument
161
- + each_ref_fn: change to take an object_id parameter
162
- + refs: convert struct ref_entry to use struct object_id
34
+* jk/clone-dissociate (2015-05-27) 2 commits
35
+ - clone: reorder --dissociate and --reference options
36
+ - clone: use OPT_STRING_LIST for --reference
37
164
- for_each_ref() callback functions were taught to name the objects
165
- not with "unsigned char sha1[20]" but with "struct object_id".
38
+ Code clean-up.
39
167
- Will merge to 'master'.
40
+ Will merge to 'next'.
41
42
170
-* jc/diff-ws-check-deleted (2015-05-26) 4 commits
171
- - diff.c: --ws-check-deleted option
172
- - diff.c: add emit_del_line() and update callers of emit_line_0()
173
- - t4015: separate common setup and per-test expectation
174
- - t4015: modernise style
43
+* jk/color-diff-plain-is-context (2015-05-27) 2 commits
44
+ - diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
45
+ - diff: accept color.diff.context as a synonym for "plain"
46
+
47
+ "color.diff.plain" was a misnomer; give it 'color.diff.context' as
48
+ a more logical synonym.
49
+
50
+ Will merge to 'next'.
51
+
52
+
53
+* jk/diagnose-config-mmap-failure (2015-05-28) 5 commits
54
+ - xmmap(): drop "Out of memory?"
55
+ - config.c: rewrite ENODEV into EISDIR when mmap fails
56
+ - config.c: avoid xmmap error messages
57
+ - config.c: fix mmap leak when writing config
58
+ - read-cache.c: drop PROT_WRITE from mmap of index
59
+
60
+ The configuration reader/writer uses mmap(2) interface to access
61
+ the files; when we find a directory, it barfed with "Out of memory?".
62
+
63
+ Will merge to 'next'.
64
+
65
+
66
+* mh/verify-lock-error-report (2015-05-27) 5 commits
67
+ - ref_transaction_commit(): do not capitalize error messages
68
+ - verify_lock(): do not capitalize error messages
69
+ - verify_lock(): report errors via a strbuf
70
+ - verify_lock(): on errors, let the caller unlock the lock
71
+ - verify_lock(): return 0/-1 rather than struct ref_lock *
72
+
73
+ Bring consistency to error reporting mechanism used in "refs" API.
74
+
75
+ Will merge to 'next'.
76
+
77
+
78
+* mt/p4-depotFile-at-version (2015-05-27) 1 commit
79
+ - p4: retrieve the right revision of the file in UTF-16 codepath
80
+
81
+ Will merge to 'next'.
82
+
83
+
84
+* sb/glossary-submodule (2015-05-29) 1 commit
85
+ - glossary: add "remote", "submodule", "superproject"
86
176
- Allow whitespace breakages in 'deleted' lines to be also painted
177
- in the output.
87
+ Will merge to 'next'.
88
+
89
+
90
+* sg/config-name-only (2015-05-28) 3 commits
91
+ - completion: use new 'git config' options to reliably list variable names
92
+ - SQUASH
93
+ - config: add options to list only variable names
94
+
95
+ "git config --list" output was hard to parse when values consist of
96
+ multiple lines. Introduce a way to show only the keys.
97
+
98
+
99
+* sg/merge-summary-config (2015-05-28) 1 commit
100
+ - Documentation: include 'merge.branchdesc' for merge and config as well
101
+
102
+
103
+* jc/push-tags-also (2015-05-29) 1 commit
104
+ - push --tags: push tags *in addition to* other stuff
105
+
106
+
107
+* jk/die-on-bogus-worktree-late (2015-05-29) 1 commit
108
+ - setup_git_directory: delay core.bare/core.worktree errors
109
+
110
+
111
+* jk/make-fix-dependencies (2015-05-29) 3 commits
112
+ - Makefile: silence perl/PM.stamp recipe
113
+ - Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS
114
+ - Makefile: drop dependency between git-instaweb and gitweb
115
116
--------------------------------------------------
117
[Stalled]
@@ -392,6 +329,81 @@ of the repositories listed at
329
--------------------------------------------------
330
[Cooking]
331
332
+* ah/send-email-sendmail-alias (2015-05-27) 2 commits
333
+ - t9001: write $HOME/, not ~/, to help shells without tilde expansion
334
+ - send-email: add sendmail email aliases format
335
+
336
+ "git send-email" learned the alias file format used by the sendmail
337
+ program (in an abbreviated form).
338
+
339
+ Will merge to 'next'.
340
+
341
+
342
+* bc/object-id (2015-05-25) 56 commits
343
+ (merged to 'next' on 2015-05-26 at 8d9f645)
344
+ + struct ref_lock: convert old_sha1 member to object_id
345
+ + warn_if_dangling_symref(): convert local variable "junk" to object_id
346
+ + each_ref_fn_adapter(): remove adapter
347
+ + rev_list_insert_ref(): remove unneeded arguments
348
+ + rev_list_insert_ref_oid(): new function, taking an object_oid
349
+ + mark_complete(): remove unneeded arguments
350
+ + mark_complete_oid(): new function, taking an object_oid
351
+ + clear_marks(): rewrite to take an object_id argument
352
+ + mark_complete(): rewrite to take an object_id argument
353
+ + send_ref(): convert local variable "peeled" to object_id
354
+ + upload-pack: rewrite functions to take object_id arguments
355
+ + find_symref(): convert local variable "unused" to object_id
356
+ + find_symref(): rewrite to take an object_id argument
357
+ + write_one_ref(): rewrite to take an object_id argument
358
+ + write_refs_to_temp_dir(): convert local variable sha1 to object_id
359
+ + submodule: rewrite to take an object_id argument
360
+ + shallow: rewrite functions to take object_id arguments
361
+ + handle_one_ref(): rewrite to take an object_id argument
362
+ + add_info_ref(): rewrite to take an object_id argument
363
+ + handle_one_reflog(): rewrite to take an object_id argument
364
+ + register_replace_ref(): rewrite to take an object_id argument
365
+ + remote: rewrite functions to take object_id arguments
366
+ + add_one_ref(): rewrite to take an object_id argument
367
+ + string_list_add_one_ref(): rewrite to take an object_id argument
368
+ + add_ref_decoration(): convert local variable original_sha1 to object_id
369
+ + add_ref_decoration(): rewrite to take an object_id argument
370
+ + show_head_ref(): convert local variable "unused" to object_id
371
+ + http-backend: rewrite to take an object_id argument
372
+ + append_similar_ref(): rewrite to take an object_id argument
373
+ + builtin/show-ref: rewrite to take an object_id argument
374
+ + show_ref(): convert local variable peeled to object_id
375
+ + builtin/show-ref: rewrite to use object_id
376
+ + fsck: change functions to use object_id
377
+ + cmd_show_branch(): fix error message
378
+ + builtin/show-branch: rewrite functions to work with object_id
379
+ + append_one_rev(): rewrite to work with object_id
380
+ + builtin/show-branch: rewrite functions to take object_id arguments
381
+ + append_matching_ref(): rewrite to take an object_id argument
382
+ + show_reference(): rewrite to take an object_id argument
383
+ + builtin/remote: rewrite functions to take object_id arguments
384
+ + add_branch_for_removal(): don't set "util" field of string_list entries
385
+ + add_branch_for_removal(): rewrite to take an object_id argument
386
+ + builtin/reflog: rewrite ref functions to take an object_id argument
387
+ + show_ref_cb(): rewrite to take an object_id argument
388
+ + builtin/pack-objects: rewrite to take an object_id argument
389
+ + name_ref(): rewrite to take an object_id argument
390
+ + grab_single_ref(): rewrite to take an object_id argument
391
+ + builtin/fetch: rewrite to take an object_id argument
392
+ + get_name(): rewrite to take an object_id argument
393
+ + add_pending_uninteresting_ref(): rewrite to take an object_id argument
394
+ + append_ref(): rewrite to take an object_id argument
395
+ + register_ref(): rewrite to take an object_id argument
396
+ + handle_one_ref(): rewrite to take an object_id argument
397
+ + builtin/rev-parse: rewrite to take an object_id argument
398
+ + each_ref_fn: change to take an object_id parameter
399
+ + refs: convert struct ref_entry to use struct object_id
400
+
401
+ for_each_ref() callback functions were taught to name the objects
402
+ not with "unsigned char sha1[20]" but with "struct object_id".
403
+
404
+ Will merge to 'master'.
405
+
406
+
407
* da/mergetool-winmerge (2015-05-20) 2 commits
408
(merged to 'next' on 2015-05-26 at d6333e9)
409
+ mergetools: add winmerge as a builtin tool
@@ -488,10 +500,10 @@ of the repositories listed at
500
Will merge to 'master'.
501
502
491
-* sb/submodule-doc-intro (2015-05-22) 1 commit
492
- - submodule documentation: reorder introductory paragraphs
503
+* sb/submodule-doc-intro (2015-05-28) 1 commit
504
+ - submodule doc: reorder introductory paragraphs
505
494
- What's the doneness of this one???
506
+ Will merge to 'next'.
507
508
509
* sb/test-bitmap-free-at-end (2015-05-22) 1 commit
@@ -579,9 +591,10 @@ of the repositories listed at
591
592
593
* ld/p4-editor-multi-words (2015-05-26) 3 commits
582
- - git-p4: tests: use test-chmtime in place of touch
583
- - git-p4: fix handling of multi-word P4EDITOR
584
- - git-p4: add failing test for P4EDITOR handling
594
+ (merged to 'next' on 2015-05-28 at a368a47)
595
+ + git-p4: tests: use test-chmtime in place of touch
596
+ + git-p4: fix handling of multi-word P4EDITOR
597
+ + git-p4: add failing test for P4EDITOR handling
598
599
Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the
600
command and initial options (e.g. "/path/to/emacs -nw"), 'git p4'
@@ -589,10 +602,10 @@ of the repositories listed at
602
variable that name the editor "$P4EDITOR" (and "$EDITOR", too).
603
Make it in line with the rest of Git, as well as with Perforce.
604
592
- Will merge to 'next'.
605
+ Will merge to 'master'.
606
607
595
-* pt/pull-tests (2015-05-18) 8 commits
608
+* pt/pull-tests (2015-05-29) 8 commits
609
- t5520: check reflog action in fast-forward merge
610
- t5521: test --dry-run does not make any changes
611
- t5520: test --rebase failure on unborn branch with index
@@ -604,6 +617,8 @@ of the repositories listed at
617
618
Add more test coverage to "git pull".
619
620
+ Will merge to 'next'.
621
+
622
623
* jc/clone-bundle (2015-04-30) 1 commit
624
- repack: optionally create a clone.bundle
@@ -652,16 +667,19 @@ of the repositories listed at
667
668
669
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
655
- - merge: drop 'git merge <message> HEAD <commit>' syntax
670
+ (merged to 'next' on 2015-05-28 at 6bfd8b9)
671
+ + merge: drop 'git merge <message> HEAD <commit>' syntax
672
673
Stop supporting "git merge <message> HEAD <commit>" syntax that
674
has been deprecated since October 2007.
675
660
- Will merge to 'next' and keep there during the 2.5 cycle.
676
+ Will keep in 'next' during the 2.5 cycle.
677
678
663
-* ah/usage-strings (2015-05-03) 2 commits
664
- - branch: fix funny-sounding error message
665
- - blame, log: format usage strings similarly to those in documentation
679
+* ah/usage-strings (2015-05-03) 1 commit
680
+ (merged to 'next' on 2015-05-28 at 5f4350e)
681
+ + blame, log: format usage strings similarly to those in documentation
682
667
- A few usage string updates. The tip one still needs work.
683
+ A few usage string updates.
684
+
685
+ Will merge to 'master'.