What's cooking (2014/08 #02)
Junio C Hamano committed
Aug 8, 2014 at 15:15 UTC
3f12bf3d478fa897c1f5b779b1e8d040bb744564
1 file changed
+192
-101
whats-cooking.txt
+192
-101
@@ -1,18 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2014, #01; Fri, 1)
4
-X-master-at: aa544bfbc6eb11e4f0471f3144d3e3ac75c0e4a9
5
-X-next-at: 6a8ef70a0a7fa126e4e0002b8f284fdec4c0f9a3
3
+Subject: What's cooking in git.git (Aug 2014, #02; Fri, 8)
4
+X-master-at: f82887f29010e1ec88ec1930a99ddc56b6438452
5
+X-next-at: edb03e5a9b9b63d0864557f99f339b2b5f3a9e4e
6
7
-What's cooking in git.git (Aug 2014, #01; Fri, 1)
7
+What's cooking in git.git (Aug 2014, #02; Fri, 8)
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
-First release candidate 2.1.0-rc1 expected early next week, after
15
-merging a couple of obvious documentation update patches.
14
+The second release candidate snapshot is out. Hopefully after a
15
+week of a calm pre-release "bugfix-only" period, we can do the 2.1
16
+final late next week.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -22,126 +23,139 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
25
-* ep/avoid-test-a-o (2014-07-25) 1 commit
26
- (merged to 'next' on 2014-07-27 at 45de31d)
27
- + t9814: fix misconversion from test $a -o $b to test $a || test $b
28
-
29
- Fix a post v2.0 regression in 'master'.
30
-
31
-
32
-* jk/more-push-completion (2014-07-22) 3 commits
33
- (merged to 'next' on 2014-07-28 at d1d4c27)
34
- + completion: complete `git push --force-with-lease=`
35
- + completion: add some missing options to `git push`
36
- + completion: complete "unstuck" `git push --recurse-submodules`
37
-
38
-
39
-* sk/mingw-tests-workaround (2014-07-21) 6 commits
40
- (merged to 'next' on 2014-07-28 at 2f3b7ac)
41
- + t800[12]: work around MSys limitation
42
- + t9902: mingw-specific fix for gitfile link files
43
- + t4210: skip command-line encoding tests on mingw
44
- + MinGW: disable legacy encoding tests
45
- + t0110/MinGW: skip tests that pass arbitrary bytes on the command line
46
- + MinGW: Skip test redirecting to fd 4
47
- (this branch is used by jc/not-mingw-cygwin.)
48
-
49
- Make tests pass on msysgit by mostly disabling ones that are
50
- infeasible on that platform.
51
-
52
-
53
-* sk/mingw-uni-fix-more (2014-07-21) 14 commits
54
- (merged to 'next' on 2014-07-28 at 0945196)
55
- + Win32: enable color output in Windows cmd.exe
56
- + Win32: patch Windows environment on startup
57
- + Win32: keep the environment sorted
58
- + Win32: use low-level memory allocation during initialization
59
- + Win32: reduce environment array reallocations
60
- + Win32: don't copy the environment twice when spawning child processes
61
- + Win32: factor out environment block creation
62
- + Win32: unify environment function names
63
- + Win32: unify environment case-sensitivity
64
- + Win32: fix environment memory leaks
65
- + Win32: Unicode environment (incoming)
66
- + Win32: Unicode environment (outgoing)
67
- + Revert "Windows: teach getenv to do a case-sensitive search"
68
- + tests: do not pass iso8859-1 encoded parameter
69
-
70
- Most of these are battle-tested in msysgit and are needed to
71
- complete what has been merged to 'master' already.
26
+* ta/doc-config (2014-07-30) 1 commit
27
+ (merged to 'next' on 2014-07-31 at ec577fa)
28
+ + add documentation for writing config files
29
+
30
+
31
+* tf/maint-doc-push (2014-07-31) 1 commit
32
+ (merged to 'next' on 2014-07-31 at 6a8ef70)
33
+ + git-push: fix link in man page
34
35
--------------------------------------------------
36
[New Topics]
37
76
-* jk/stash-list-p (2014-07-30) 7 commits
77
- - SQUASH??? future-proof, log --cc should imply -p without being told
78
- - stash: show combined diff with "stash show"
79
- - stash: default listing to "--cc --simplify-combined-diff"
80
- - add --simplify-combined-diff option
81
- - pretty: make empty userformats truly empty
82
- - pretty: treat "--format=" as an empty userformat
83
- - revision: drop useless string offset when parsing "--pretty"
38
+* tf/imap-send-create (2014-08-01) 3 commits
39
+ - SQUASH??? varargs form of issue-imap-cmd is no longer used
40
+ - imap-send: create target mailbox if it is missing
41
+ - imap-send: clarify CRAM-MD5 vs LOGIN documentation
42
85
- Teach "git stash list -p" to DWIM to "git stash list -p --cc", with
86
- even nicer twist to collapse combined diff from identical two
87
- parents into a regular diff.
43
+ Will merge to 'next' after dealing with the SQUASH??? fix-up.
44
45
90
-* pr/remotes-in-hashmap (2014-07-30) 1 commit
91
- - use a hashmap to make remotes faster
46
+* bc/archive-pax-header-mode (2014-08-04) 1 commit
47
+ - archive: honor tar.umask even for pax headers
48
93
- Optimize remotes configuration look-up in a repository with very
94
- many remotes defined.
49
+ Implementations of "tar" that do not understand an extended pax
50
+ header would extract the contents of it in a regular file; make
51
+ sure the permission bits of this file follows the same tar.umask
52
+ configuration setting.
53
54
+ Will merge to 'next'.
55
97
-* rs/ref-transaction-multi (2014-07-31) 5 commits
98
- - refs.c: make the *_packed_refs functions static
99
- - refs.c: make repack_without_refs static
100
- - remote.c: use a transaction for deleting refs
101
- - refs.c: write updates to packed refs when a transaction has more than one ref
102
- - refs.c: move reflog updates into its own function
103
- (this branch uses rs/ref-transaction, rs/ref-transaction-1, rs/ref-transaction-reflog and rs/ref-transaction-rename.)
56
105
- Follow-up on rs/ref-transaction series to use the packed-ref to
106
- achieve atomicity when multiple refs are involved.
57
+* bc/imap-send-doc (2014-08-05) 1 commit
58
+ - imap-send doc: omit confusing "to use imap-send" modifier
59
60
+ Will merge to 'next'.
61
109
-* rs/ref-transaction-rename (2014-07-31) 5 commits
110
- - refs.c: rollback the lockfile before we die() in repack_without_refs
111
- - refs.c: update rename_ref to use a transaction
112
- - refs.c: use packed refs when deleting refs during a transaction
113
- - refs.c: return error instead of dying when locking fails during transaction
114
- - refs.c: allow passing raw git_committer_info as email to _update_reflog
115
- (this branch is used by rs/ref-transaction-multi; uses rs/ref-transaction, rs/ref-transaction-1 and rs/ref-transaction-reflog.)
62
117
- Follow-up on rs/ref-transaction series to make renaming a ref
118
- transactional (i.e. "delete old and create new" should not leave
119
- an in-between state behind when it fails).
63
+* jc/apply-ws-prefix (2014-08-07) 3 commits
64
+ - apply: omit ws check for excluded paths
65
+ - apply: hoist use_patch() helper for path exclusion up
66
+ - apply: use the right attribute for paths in non-Git patches
67
68
+ Applying a patch not generated by Git in a subdirectory used to
69
+ check the whitespace breakage using the attributes for incorrect
70
+ paths. Also whitespace checks were performed even for paths
71
+ excluded via "git apply --exclude=<path>" mechanism.
72
122
-* ta/doc-config (2014-07-30) 1 commit
123
- (merged to 'next' on 2014-07-31 at ec577fa)
124
- + add documentation for writing config files
73
+ Will merge to 'next'.
74
126
- Will merge to 'master'.
75
76
+* jk/command-line-config-empty-string (2014-08-05) 1 commit
77
+ - config: teach "git -c" to recognize an empty string
78
129
-* tf/maint-doc-push (2014-07-31) 1 commit
130
- (merged to 'next' on 2014-07-31 at 6a8ef70)
131
- + git-push: fix link in man page
79
+ "git -c section.var command" and "git -c section.var= command"
80
+ should pass the configuration differently (the former should be
81
+ a boolean true, the latter should be an empty string).
82
133
- Will merge to 'master' and later to 'maint'.
83
+ Will merge to 'next'.
84
85
136
-* nd/lock-paths-absolute (2014-08-01) 3 commits
137
- - lockfile.c: store absolute path
138
- - lockfile.c: remove PATH_MAX limit in resolve_symlink()
139
- - lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)
140
- (this branch uses rs/strbuf-getcwd.)
86
+* jk/pack-bitmap (2014-08-04) 1 commit
87
+ - pack-bitmap: do not use gcc packed attribute
88
89
+ Will merge to 'next'.
90
143
-* mm/config-message-i18n (2014-08-01) 1 commit
91
+
92
+* jk/pretty-empty-format (2014-07-30) 3 commits
93
+ - pretty: make empty userformats truly empty
94
+ - pretty: treat "--format=" as an empty userformat
95
+ - revision: drop useless string offset when parsing "--pretty"
96
+
97
+ "git log --pretty/format=" with an empty format string did not mean
98
+ the more obvious "No output whatsoever" but "Use default format",
99
+ which was counterintuitive.
100
+
101
+ Will merge to 'next'.
102
+
103
+
104
+* la/init-doc (2014-08-08) 7 commits
105
+ - Documentation: git-init: flesh out example
106
+ - Documentation: git-init: template directory: reword and cross-reference
107
+ - Documentation: git-init: reword parenthetical statements
108
+ - Documentation: git-init: --separate-git-dir: clarify
109
+ - Documentation: git-init: template directory: reword
110
+ - Documentation: git-init: list items facelift
111
+ - Documentation: git-init: typographical fixes
112
+
113
+ Will merge to 'next'.
114
+
115
+
116
+* lf/bundle-exclusion (2014-08-07) 1 commit
117
+ - bundle: fix exclusion of annotated tags
118
+
119
+ Will merge to 'next'.
120
+
121
+
122
+* mm/log-branch-desc-plug-leak (2014-08-07) 1 commit
123
+ - builtin/log.c: fix minor memory leak
124
+
125
+ Will merge to 'next'.
126
+
127
+
128
+* ta/config-set-1 (2014-08-07) 8 commits
129
+ - add tests for `git_config_get_string_const()`
130
+ - add a test for semantic errors in config files
131
+ - rewrite git_config() to use the config-set API
132
+ - config: add `git_die_config()` to the config-set API
133
+ - change `git_config()` return value to void
134
+ - add line number and file name info to `config_set`
135
+ - config.c: fix accuracy of line number in errors
136
- config.c: mark error and warnings strings for translation
137
+ (this branch is used by ta/config-set-2; uses ta/config-set.)
138
+
139
+
140
+* ta/config-set-2 (2014-08-07) 11 commits
141
+ - branch.c: replace `git_config()` with `git_config_get_string()
142
+ - alias.c: replace `git_config()` with `git_config_get_string()`
143
+ - imap-send.c: replace `git_config()` with `git_config_get_*()` family
144
+ - pager.c: replace `git_config()` with `git_config_get_value()`
145
+ - builtin/gc.c: replace `git_config()` with `git_config_get_*()` family
146
+ - rerere.c: replace `git_config()` with `git_config_get_*()` family
147
+ - fetchpack.c: replace `git_config()` with `git_config_get_*()` family
148
+ - archive.c: replace `git_config()` with `git_config_get_bool()` family
149
+ - read-cache.c: replace `git_config()` with `git_config_get_*()` family
150
+ - http-backend.c: replace `git_config()` with `git_config_get_bool()` family
151
+ - daemon.c: replace `git_config()` with `git_config_get_bool()` family
152
+ (this branch uses ta/config-set and ta/config-set-1.)
153
+
154
+
155
+* ta/pretty-parse-config (2014-08-04) 1 commit
156
+ - pretty.c: make git_pretty_formats_config return -1 on git_config_string failure
157
+
158
+ Will merge to 'next'.
159
160
--------------------------------------------------
161
[Stalled]
@@ -361,6 +375,69 @@ of the repositories listed at
375
--------------------------------------------------
376
[Cooking]
377
378
+* jk/stash-list-p (2014-08-07) 1 commit
379
+ - stash: default listing to working-tree diff
380
+
381
+ Teach "git stash list -p" to show the difference between the base
382
+ commit version and the working tree version, which is in line with
383
+ what "git show" gives.
384
+
385
+ Will merge to 'next'.
386
+
387
+
388
+* pr/remotes-in-hashmap (2014-07-30) 1 commit
389
+ - use a hashmap to make remotes faster
390
+
391
+ Optimize remotes configuration look-up in a repository with very
392
+ many remotes defined.
393
+
394
+ Will merge to 'next'.
395
+
396
+
397
+* rs/ref-transaction-multi (2014-07-31) 5 commits
398
+ - refs.c: make the *_packed_refs functions static
399
+ - refs.c: make repack_without_refs static
400
+ - remote.c: use a transaction for deleting refs
401
+ - refs.c: write updates to packed refs when a transaction has more than one ref
402
+ - refs.c: move reflog updates into its own function
403
+ (this branch uses rs/ref-transaction, rs/ref-transaction-1, rs/ref-transaction-reflog and rs/ref-transaction-rename.)
404
+
405
+ Follow-up on rs/ref-transaction series to use the packed-ref to
406
+ achieve atomicity when multiple refs are involved.
407
+
408
+ No more nitpicks and better design suggestions?
409
+
410
+
411
+* rs/ref-transaction-rename (2014-07-31) 5 commits
412
+ - refs.c: rollback the lockfile before we die() in repack_without_refs
413
+ - refs.c: update rename_ref to use a transaction
414
+ - refs.c: use packed refs when deleting refs during a transaction
415
+ - refs.c: return error instead of dying when locking fails during transaction
416
+ - refs.c: allow passing raw git_committer_info as email to _update_reflog
417
+ (this branch is used by rs/ref-transaction-multi; uses rs/ref-transaction, rs/ref-transaction-1 and rs/ref-transaction-reflog.)
418
+
419
+ Follow-up on rs/ref-transaction series to make renaming a ref
420
+ transactional (i.e. "delete old and create new" should not leave
421
+ an in-between state behind when it fails).
422
+
423
+ No more nitpicks and better design suggestions?
424
+
425
+
426
+* nd/lock-paths-absolute (2014-08-01) 3 commits
427
+ - lockfile.c: store absolute path
428
+ - lockfile.c: remove PATH_MAX limit in resolve_symlink()
429
+ - lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)
430
+ (this branch uses rs/strbuf-getcwd.)
431
+
432
+ Will merge to 'next'.
433
+
434
+
435
+* mm/config-message-i18n (2014-08-01) 1 commit
436
+ - config.c: mark error and warnings strings for translation
437
+
438
+ Will discard (now at the bottom of ta/config-set-1 topic).
439
+
440
+
441
* mm/config-edit-global (2014-07-25) 3 commits
442
(merged to 'next' on 2014-07-31 at ecce1c7)
443
+ commit: advertise config --global --edit on guessed identity
@@ -404,11 +481,18 @@ of the repositories listed at
481
Cover updates to reflog with the same transaction mechanism as used
482
for reflog manipulations.
483
484
+ No more nitpicks and better design suggestions?
485
+
486
487
* cb/mergetool-difftool (2014-07-21) 2 commits
488
- difftool: don't assume that default sh is sane
489
- mergetool: don't require a work tree for --tool-help
490
491
+ Update the way the "difftool --help" shows the help message that is
492
+ shared with the "mergetool" to reduce one shell dependency.
493
+
494
+ Will merge to 'next'.
495
+
496
497
* rs/strbuf-getcwd (2014-07-29) 10 commits
498
(merged to 'next' on 2014-07-31 at 6edc3bc)
@@ -440,10 +524,13 @@ of the repositories listed at
524
* ta/config-set (2014-07-29) 2 commits
525
- test-config: add tests for the config_set API
526
- add `config_set` API for caching config-like files
527
+ (this branch is used by ta/config-set-1 and ta/config-set-2.)
528
529
Add in-core caching layer to let us avoid reading the same
530
configuration files number of times.
531
532
+ Will merge to 'next'.
533
+
534
535
* rs/ref-transaction-1 (2014-07-16) 20 commits
536
- refs.c: make delete_ref use a transaction
@@ -470,6 +557,8 @@ of the repositories listed at
557
558
The second batch of the transactional ref update series.
559
560
+ No more nitpicks and better design suggestions?
561
+
562
563
* jc/reopen-lock-file (2014-07-14) 1 commit
564
(merged to 'next' on 2014-07-21 at 8277dc9)
@@ -536,6 +625,8 @@ of the repositories listed at
625
626
Continue polishing nd/multiple-work-trees topic in 'next'.
627
628
+ Will merge to 'next'.
629
+
630
631
* dt/cache-tree-repair (2014-07-14) 4 commits
632
(merged to 'next' on 2014-07-21 at e83db34)