What's cooking (2015/03 #05)
Junio C Hamano committed
Mar 14, 2015 at 00:07 UTC
2e4bcd971a42a0fc58a3cf366c2998bc9d6ad328
1 file changed
+158
-117
whats-cooking.txt
+158
-117
@@ -1,141 +1,81 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2015, #04; Wed, 11)
4
-X-master-at: 7a9409cb0104466eba32162f5bc4e5ab46130f02
5
-X-next-at: 1f807f94f1528a9b78383ecd4a5f640fbc72426b
3
+Subject: What's cooking in git.git (Mar 2015, #05; Sat, 14)
4
+X-master-at: 52cae643c5d49b7fa18a7a4c60c284f9ae2e2c71
5
+X-next-at: dac11456999723012aeb1167e3d09a83b1e0f740
6
7
-What's cooking in git.git (Mar 2015, #04; Wed, 11)
7
+What's cooking in git.git (Mar 2015, #05; Sat, 14)
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
-It is becoming clear that the upcoming release will be a usual
15
-incremental improvements and not an earth shattering one. Let's
16
-decide to name it 2.4, move the top-level RelNotes down to its usual
17
-place in Documentation/RelNotes and make it a symbolic link.
14
+On the 'maint' front is the latest maintenance release v2.3.3.
15
16
You can find the changes described here in the integration branches
17
of the repositories listed at
18
19
http://git-blame.blogspot.com/p/git-public-repositories.html
20
24
---------------------------------------------------
25
-[Graduated to "master"]
26
-
27
-* jk/diffcore-rename-duplicate (2015-02-27) 2 commits
28
- (merged to 'next' on 2015-03-03 at 1d5a2d2)
29
- + diffcore-rename: avoid processing duplicate destinations
30
- + diffcore-rename: split locate_rename_dst into two functions
31
-
32
- A corrupt input to "git diff -M" can cause us to segfault.
33
-
34
-
35
-* mh/expire-updateref-fixes (2015-03-05) 9 commits
36
- (merged to 'next' on 2015-03-05 at 1caf9a6)
37
- + reflog_expire(): never update a reference to null_sha1
38
- + reflog_expire(): ignore --updateref for symbolic references
39
- + reflog: improve and update documentation
40
- + struct ref_lock: delete the force_write member
41
- + lock_ref_sha1_basic(): do not set force_write for missing references
42
- + write_ref_sha1(): move write elision test to callers
43
- + write_ref_sha1(): remove check for lock == NULL
44
- + Merge branch 'sb/atomic-push' into mh/ref-trans-value-check
45
- + Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check
46
-
47
- Various issues around "reflog expire", e.g. using --updateref when
48
- expiring a reflog for a symbolic reference, have been corrected
49
- and/or made saner.
50
-
21
--------------------------------------------------
22
[New Topics]
23
54
-* kn/git-cd-to-empty (2015-03-06) 1 commit
55
- - git: treat "git -C '<path>'" as a no-op when <path> is empty
56
-
57
- "git -C '' subcmd" refused to work in the current directory, unlike
58
- "cd ''" which silently behaves as a no-op.
59
-
60
- Will merge to 'next'.
61
-
62
-
63
-* dj/log-graph-with-no-walk (2015-03-10) 1 commit
64
- - revision: forbid combining --graph and --no-walk
65
-
66
- "git log --graph --no-walk A B..." is a otcnflicting request that
67
- asks nonsense; no-walk tells us show discrete points in the
68
- history, while graph asks to draw connections between these
69
- discrete points. Forbid the combination.
70
-
71
- Will replace with the version that does not special case "git show"
72
- that implies "--no-walk" unless it is given a range.
73
-
74
-
75
-* km/bsd-shells (2015-03-10) 5 commits
76
- - t5528: do not fail with FreeBSD shell
77
- - help.c: use SHELL_PATH instead of hard-coded "/bin/sh"
78
- - git-compat-util.h: move SHELL_PATH default into header
79
- - git-instaweb: use @SHELL_PATH@ instead of /bin/sh
80
- - git-instaweb: allow running in a working tree subdirectory
81
-
82
- Portability fixes and workarounds for shell scripts have been added
83
- to help BSD-derived systems.
84
-
85
- Will merge to 'next'.
86
-
24
+* jk/tag-h-column-is-a-listing-option (2015-03-12) 1 commit
25
+ - tag: fix some mis-organized options in "-h" listing
26
88
-* km/bsd-sysctl (2015-03-10) 2 commits
89
- - thread-utils.c: detect CPU count on older BSD-like systems
90
- - configure: support HAVE_BSD_SYSCTL option
91
-
92
- We now detect number of CPUs on older BSD-derived systems.
27
+ "git tag -h" used to show the "--column" and "--sort" options
28
+ that are about listing in a wrong section.
29
30
Will merge to 'next'.
31
32
97
-* km/imap-send-libcurl-options (2015-03-10) 1 commit
98
- - imap-send: use cURL automatically when NO_OPENSSL defined
33
+* as/userdiff-sh (2015-03-13) 1 commit
34
+ - userdiff: funcname and word patterns for sh
35
100
- "git imap-send" learned to optionally talk with an IMAP server via
101
- libcURL; because there is no other option when Git is built with
102
- NO_OPENSSL option, use that codepath by default under such
103
- configuration.
36
105
- Will merge to 'next'.
37
+* bc/object-id (2015-03-13) 10 commits
38
+ - apply: convert threeway_stage to object_id
39
+ - patch-id: convert to use struct object_id
40
+ - commit: convert parts to struct object_id
41
+ - diff: convert struct combine_diff_path to object_id
42
+ - bulk-checkin.c: convert to use struct object_id
43
+ - zip: use GIT_SHA1_HEXSZ for trailers
44
+ - archive.c: convert to use struct object_id
45
+ - bisect.c: convert leaf functions to use struct object_id
46
+ - define utility functions for object IDs
47
+ - define a structure for object IDs
48
49
108
-* mg/doc-status-color-slot (2015-03-10) 1 commit
109
- - config,completion: add color.status.unmerged
110
-
111
- Documentation fixes.
50
+* ct/prompt-untracked-fix (2015-03-13) 1 commit
51
+ - git prompt: use toplevel to find untracked files
52
113
- Will merge to 'next'.
53
+ The prompt script (in contrib/) did not show the untracked sign
54
+ when working in a subdirectory without any untracked files.
55
56
116
-* mg/verify-commit (2015-03-10) 1 commit
117
- - t7510: do not fail when gpg warns about insecure memory
57
+* jk/smart-http-hide-refs (2015-03-12) 2 commits
58
+ - upload-pack: do not check NULL return of lookup_unknown_object
59
+ - upload-pack: fix transfer.hiderefs over smart-http
60
119
- Workarounds for certain build of GPG that triggered false breakage
120
- in a test..
61
+ The transfer.hiderefs support did not quite work for smart-http
62
+ transport.
63
64
Will merge to 'next'.
65
66
125
-* rs/use-isxdigit (2015-03-10) 1 commit
126
- - use isxdigit() for checking if a character is a hexadecimal digit
127
-
128
- Code cleanup.
67
+* jk/test-annoyances (2015-03-12) 5 commits
68
+ - t5551: make EXPENSIVE test cheaper
69
+ - t5541: move run_with_cmdline_limit to test-lib.sh
70
+ - t: pass GIT_TRACE through Apache
71
+ - t: redirect stderr GIT_TRACE to descriptor 4
72
+ - t: translate SIGINT to an exit
73
74
Will merge to 'next'.
75
76
133
-* sb/leaks (2015-03-10) 3 commits
134
- - builtin/help.c: fix memory leak
135
- - bundle.c: fix memory leak
136
- - connect.c: do not leak "conn" after showing diagnosis
137
-
138
- Code cleanup.
77
+* nd/config-doc-camelCase (2015-03-13) 1 commit
78
+ - *config.txt: stick to camelCase naming convention
79
80
Will merge to 'next'.
81
@@ -152,7 +92,7 @@ of the repositories listed at
92
($gmane/263880, $gmane/263991).
93
94
155
-* nd/untracked-cache (2015-02-09) 24 commits
95
+* nd/untracked-cache (2015-03-12) 24 commits
96
- git-status.txt: advertisement for untracked cache
97
- untracked cache: guard and disable on system changes
98
- mingw32: add uname()
@@ -331,6 +271,103 @@ of the repositories listed at
271
--------------------------------------------------
272
[Cooking]
273
274
+* kn/git-cd-to-empty (2015-03-06) 1 commit
275
+ (merged to 'next' on 2015-03-12 at 54dea03)
276
+ + git: treat "git -C '<path>'" as a no-op when <path> is empty
277
+
278
+ "git -C '' subcmd" refused to work in the current directory, unlike
279
+ "cd ''" which silently behaves as a no-op.
280
+
281
+ Will merge to 'master'.
282
+
283
+
284
+* dj/log-graph-with-no-walk (2015-03-10) 1 commit
285
+ - revision: forbid combining --graph and --no-walk
286
+
287
+ "git log --graph --no-walk A B..." is a otcnflicting request that
288
+ asks nonsense; no-walk tells us show discrete points in the
289
+ history, while graph asks to draw connections between these
290
+ discrete points. Forbid the combination.
291
+
292
+ Will replace with the version that does not special case "git show"
293
+ that implies "--no-walk" unless it is given a range.
294
+
295
+
296
+* km/bsd-shells (2015-03-10) 5 commits
297
+ (merged to 'next' on 2015-03-13 at f839e4c)
298
+ + t5528: do not fail with FreeBSD shell
299
+ + help.c: use SHELL_PATH instead of hard-coded "/bin/sh"
300
+ + git-compat-util.h: move SHELL_PATH default into header
301
+ + git-instaweb: use @SHELL_PATH@ instead of /bin/sh
302
+ + git-instaweb: allow running in a working tree subdirectory
303
+
304
+ Portability fixes and workarounds for shell scripts have been added
305
+ to help BSD-derived systems.
306
+
307
+ Will merge to 'master'.
308
+
309
+
310
+* km/bsd-sysctl (2015-03-10) 2 commits
311
+ (merged to 'next' on 2015-03-13 at c4557c9)
312
+ + thread-utils.c: detect CPU count on older BSD-like systems
313
+ + configure: support HAVE_BSD_SYSCTL option
314
+
315
+ We now detect number of CPUs on older BSD-derived systems.
316
+
317
+ Will merge to 'master'.
318
+
319
+
320
+* km/imap-send-libcurl-options (2015-03-10) 1 commit
321
+ (merged to 'next' on 2015-03-13 at 569d0c4)
322
+ + imap-send: use cURL automatically when NO_OPENSSL defined
323
+
324
+ "git imap-send" learned to optionally talk with an IMAP server via
325
+ libcURL; because there is no other option when Git is built with
326
+ NO_OPENSSL option, use that codepath by default under such
327
+ configuration.
328
+
329
+ Will merge to 'master'.
330
+
331
+
332
+* mg/doc-status-color-slot (2015-03-10) 1 commit
333
+ (merged to 'next' on 2015-03-12 at e53910a)
334
+ + config,completion: add color.status.unmerged
335
+
336
+ Documentation fixes.
337
+
338
+ Will merge to 'master'.
339
+
340
+
341
+* mg/verify-commit (2015-03-10) 1 commit
342
+ (merged to 'next' on 2015-03-13 at 292197f)
343
+ + t7510: do not fail when gpg warns about insecure memory
344
+
345
+ Workarounds for certain build of GPG that triggered false breakage
346
+ in a test..
347
+
348
+ Will merge to 'master'.
349
+
350
+
351
+* rs/use-isxdigit (2015-03-10) 1 commit
352
+ (merged to 'next' on 2015-03-13 at 39e99dd)
353
+ + use isxdigit() for checking if a character is a hexadecimal digit
354
+
355
+ Code cleanup.
356
+
357
+ Will merge to 'master'.
358
+
359
+
360
+* sb/leaks (2015-03-10) 3 commits
361
+ (merged to 'next' on 2015-03-13 at 50317d6)
362
+ + builtin/help.c: fix memory leak
363
+ + bundle.c: fix memory leak
364
+ + connect.c: do not leak "conn" after showing diagnosis
365
+
366
+ Code cleanup.
367
+
368
+ Will merge to 'master'.
369
+
370
+
371
* mh/fdopen-with-retry (2015-03-06) 6 commits
372
- buffer_fdinit(): use fdopen_with_retry()
373
- update_info_file(): use fdopen_with_retry()
@@ -369,8 +406,9 @@ of the repositories listed at
406
407
408
* mg/log-decorate-HEAD (2015-03-10) 2 commits
372
- - log: decorate HEAD with branch name
373
- - Merge branch 'jc/decorate-leaky-separator-color' into HEAD
409
+ (merged to 'next' on 2015-03-13 at 96ce660)
410
+ + log: decorate HEAD with branch name
411
+ + Merge branch 'jc/decorate-leaky-separator-color' into HEAD
412
(this branch uses jc/decorate-leaky-separator-color.)
413
414
Output from "git log --decorate" mentions HEAD when it points at a
@@ -378,17 +416,18 @@ of the repositories listed at
416
417
This is a potentially backward-incompatible change.
418
381
- Will merge to 'next'.
419
+ Will merge to 'master'.
420
421
422
* rs/daemon-hostname-in-strbuf (2015-03-09) 2 commits
385
- - daemon: deglobalize hostname information
386
- - daemon: use strbuf for hostname info
423
+ (merged to 'next' on 2015-03-12 at 7f61f07)
424
+ + daemon: deglobalize hostname information
425
+ + daemon: use strbuf for hostname info
426
427
Code in "git daemon" to parse out and hold hostnames used in
428
request interpolation has been simplified.
429
391
- Will merge to 'next'.
430
+ Will merge to 'master'.
431
432
433
* rs/deflate-init-cleanup (2015-03-05) 1 commit
@@ -432,8 +471,9 @@ of the repositories listed at
471
472
473
* mg/detached-head-report (2015-03-06) 2 commits
435
- - branch: name detached HEAD analogous to status
436
- - wt-status: refactor detached HEAD analysis
474
+ (merged to 'next' on 2015-03-12 at 89443b5)
475
+ + branch: name detached HEAD analogous to status
476
+ + wt-status: refactor detached HEAD analysis
477
478
"git branch" on a detached HEAD always said "(detached from xyz)",
479
even when "git status" would report "detached at xyz". The HEAD is
@@ -441,7 +481,7 @@ of the repositories listed at
481
such a case, but the user cannot read what the current value of
482
HEAD is when "detached from" is used.
483
444
- Will merge to 'next'.
484
+ Will merge to 'master'.
485
486
487
* mg/status-v-v (2015-03-06) 3 commits
@@ -511,19 +551,20 @@ of the repositories listed at
551
552
553
* jc/decorate-leaky-separator-color (2015-03-04) 7 commits
514
- - log --decorate: do not leak "commit" color into the next item
515
- - Documentation/config.txt: simplify boolean description in the syntax section
516
- - Documentation/config.txt: describe 'color' value type in the "Values" section
517
- - Documentation/config.txt: have a separate "Values" section
518
- - Documentation/config.txt: describe the structure first and then meaning
519
- - Documentation/config.txt: explain multi-valued variables once
520
- - Documentation/config.txt: avoid unnecessary negation
554
+ (merged to 'next' on 2015-03-13 at 38e7cd1)
555
+ + log --decorate: do not leak "commit" color into the next item
556
+ + Documentation/config.txt: simplify boolean description in the syntax section
557
+ + Documentation/config.txt: describe 'color' value type in the "Values" section
558
+ + Documentation/config.txt: have a separate "Values" section
559
+ + Documentation/config.txt: describe the structure first and then meaning
560
+ + Documentation/config.txt: explain multi-valued variables once
561
+ + Documentation/config.txt: avoid unnecessary negation
562
(this branch is used by mg/log-decorate-HEAD.)
563
564
"git log --decorate" did not reset colors correctly around the
565
branch names.
566
526
- Waiting for reviews.
567
+ Will merge to 'master'
568
569
570
* js/fsck-opt (2015-01-21) 19 commits