What's cooking (2016/01 #01)
Junio C Hamano committed
Jan 4, 2016 at 15:22 UTC
e2281f41cbc172e8dd122c1fe1290e3b4a8b091b
1 file changed
+120
-155
whats-cooking.txt
+120
-155
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2015, #06; Mon, 28)
4
-X-master-at: 28274d02c489f4c7e68153056e9061a46f62d7a0
5
-X-next-at: 0ac5344e619fec2068de9ab2afdb99d1af8854be
3
+Subject: What's cooking in git.git (Jan 2016, #01; Mon, 4)
4
+X-master-at: 754884255bb580df159e58defa81cdd30b5c430c
5
+X-next-at: ef7b32d4f2d070ec6e688815cb7d6b6c2bc843fb
6
7
-What's cooking in git.git (Dec 2015, #06; Mon, 28)
7
+What's cooking in git.git (Jan 2016, #01; Mon, 4)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,8 +12,8 @@ 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
-v2.7.0-rc3, hopefully the last release candidate for the upcoming 2.7
16
-release, has been tagged.
15
+Git 2.7 has been released. Also, Git 2.6.5, hopefully the final
16
+maintenance release for 2.6.x series, has been released.
17
18
You can find the changes described here in the integration branches of the
19
repositories listed at
@@ -21,102 +21,118 @@ repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
24
-[Graduated to "master"]
24
+[New Topics]
25
+
26
+* jk/notes-merge-from-anywhere (2015-12-29) 1 commit
27
+ - notes: allow merging from arbitrary references
28
26
-* bc/format-patch-null-from-line (2015-12-15) 3 commits
27
- (merged to 'next' on 2015-12-16 at ff58fc7)
28
- + format-patch: check that header line has expected format
29
- + format-patch: add an option to suppress commit hash
30
- + sha1_file.c: introduce a null_oid constant
29
+ "git notes merge" used to limit the source of the merged notes tree
30
+ to somewhere under refs/notes/ hierarchy, which was too limiting
31
+ when inventing a workflow to exchange notes with remote
32
+ repositories using remote-tracking notes trees (located in e.g.
33
+ refs/remote-notes/ or somesuch).
34
32
- "format-patch" has learned a new option to zero-out the commit
33
- object name on the mbox "From " line.
35
+ Needs review.
36
37
36
-* fr/rebase-i-continue-preserve-options (2015-12-11) 1 commit
37
- (merged to 'next' on 2015-12-15 at e99677a)
38
- + rebase -i: remember merge options beyond continue actions
38
+* dk/reflog-walk-with-non-commit (2015-12-30) 1 commit
39
+ - reflog-walk: don't segfault on non-commit sha1's in the reflog
40
40
- "git rebase -i" started with merge strategy options did not
41
- propagate them upon "git rebase --continue".
41
+ "git reflog" incorrectly assumed that all objects that used to be
42
+ at the tip of a ref must be commits, which caused it to segfault.
43
44
+ Needs a bit of tweak to the test?
45
+ ($gmane/283245).
46
44
-* jk/ident-loosen-getpwuid (2015-12-14) 3 commits
45
- (merged to 'next' on 2015-12-15 at 0c8137b)
46
- + ident: loosen getpwuid error in non-strict mode
47
- + ident: keep a flag for bogus default_email
48
- + ident: make xgetpwuid_self() a static local helper
47
50
- When getpwuid() on the system returned NULL (e.g. the user is not
51
- in the /etc/passwd file or other uid-to-name mappings), the
52
- codepath to find who the user is to record it in the reflog barfed
53
- and died. Loosen the check in this codepath, which already accepts
54
- questionable ident string (e.g. host part of the e-mail address is
55
- obviously bogus), and in general when we operate fmt_ident() function
56
- in non-strict mode.
48
+* ew/send-email-mutt-alias-fix (2016-01-04) 1 commit
49
+ - git-send-email: do not double-escape quotes from mutt
50
51
+ "git send-email" was confused by escaped quotes stored in the alias
52
+ files saved by "mutt".
53
+
54
+ Will merge to 'next'.
55
59
-* jk/pending-keep-tag-name (2015-12-17) 1 commit
60
- (merged to 'next' on 2015-12-22 at d00d451)
61
- + revision.c: propagate tag names from pending array
56
63
- History traversal with "git log --source" that starts with an
64
- annotated tag failed to report the tag as "source", due to an
65
- old regression in the command line parser back in v2.2 days.
57
+* jk/clang-pedantic (2016-01-04) 2 commits
58
+ - bswap: add NO_UNALIGNED_LOADS define
59
+ - avoid shifting signed integers 31 bits
60
61
+ A few unportable C construct have been spotted by clang compiler
62
+ and have been fixed.
63
+
64
+ Will merge to 'next'.
65
+
66
+--------------------------------------------------
67
+[Stalled]
68
+
69
+* kf/http-proxy-auth-methods (2015-11-04) 3 commits
70
+ . SQUASH???
71
+ . http: use credential API to handle proxy authentication
72
+ . http: allow selection of proxy authentication method
73
+
74
+ New http.proxyAuthMethod configuration variable can be used to
75
+ specify what authentication method to use, as a way to work around
76
+ proxies that do not give error response expected by libcurl when
77
+ CURLAUTH_ANY is used. Also, the codepath for proxy authentication
78
+ has been taught to use credential API to store the authentication
79
+ material in user's keyrings.
80
68
-* jk/send-email-ssl-errors (2015-12-11) 1 commit
69
- (merged to 'next' on 2015-12-15 at 104f448)
70
- + send-email: enable SSL level 1 debug output
81
+ I ejected this from pu for the moment, as it conflicts with the
82
+ pt/http-socks-proxy topic. That is now in master, so it can
83
+ be re-rolled on top.
84
72
- Improve error reporting when SMTP TLS fails.
85
+ Anybody wants to help rerolling this? Otherwise will discard.
86
87
75
-* jk/symbolic-ref-maint (2015-12-21) 2 commits
76
- (merged to 'next' on 2015-12-22 at f0d548e)
77
- + t1401: test reflog creation for git-symbolic-ref
78
- + symbolic-ref: propagate error code from create_symref()
79
- (this branch is used by jk/symbolic-ref.)
88
+* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
89
+ - t/lib-git-svn: check same httpd module dirs as lib-httpd
90
+ - t/lib-httpd: load mod_unixd
91
81
- "git symbolic-ref" forgot to report a failure with its exit status.
92
+ This is the first two commits in a three-patch series $gmane/266962
93
94
+ Becoming tired of waiting for a reroll.
95
+ with updated log message ($gmane/268061).
96
+ Will discard.
97
84
-* js/emu-write-epipe-on-windows (2015-12-21) 1 commit
85
- + mingw: emulate write(2) that fails with a EPIPE
98
87
- The write(2) emulation for Windows learned to set errno to EPIPE
88
- when necessary.
99
+* wp/sha1-name-negative-match (2015-06-08) 2 commits
100
+ - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
101
+ - test for '!' handling in rev-parse's named commits
102
103
+ Introduce "branch^{/!-<pattern>}" notation to name a commit
104
+ reachable from branch that does not match the given pattern.
105
91
-* mc/push-recurse-submodules-config (2015-12-04) 3 commits
92
- (merged to 'next' on 2015-12-08 at 1b81967)
93
- + push: follow the "last one wins" convention for --recurse-submodules
94
- + push: test that --recurse-submodules on command line overrides config
95
- (merged to 'next' on 2015-11-24 at 3644d4b)
96
- + push: add recurseSubmodules config option
106
+ Becoming tired of waiting for a reroll.
107
+ ($gmane/271213).
108
+ Anybody wants to help rerolling this? Otherwise will discard.
109
98
- Add new config to avoid typing "--recurse-submodules" on each push.
110
111
+* ak/format-patch-odir-config (2015-06-19) 1 commit
112
+ - format-patch: introduce format.outputDirectory configuration
113
101
-* sg/completion-no-column (2015-12-11) 1 commit
102
- (merged to 'next' on 2015-12-15 at 01a2476)
103
- + completion: remove 'git column' from porcelain commands
114
+ Becoming tired of waiting for a reroll.
115
+ Anybody wants to help rerolling this? Otherwise will discard.
116
+ ($gmane/272180).
117
105
- The completion script (in contrib/) used to list "git column"
106
- (which is not an end-user facing command) as one of the choices
118
119
+* jc/diff-b-m (2015-02-23) 5 commits
120
+ . WIPWIP
121
+ . WIP: diff-b-m
122
+ - diffcore-rename: allow easier debugging
123
+ - diffcore-rename.c: add locate_rename_src()
124
+ - diffcore-break: allow debugging
125
109
-* sh/p4-multi-depot (2015-12-21) 3 commits
110
- (merged to 'next' on 2015-12-22 at aff269a)
111
- + git-p4: reduce number of server queries for fetches
112
- + git-p4: support multiple depot paths in p4 submit
113
- + git-p4: failing test case for skipping changes with multiple depots
126
+ "git diff -B -M" produced incorrect patch when the postimage of a
127
+ completely rewritten file is similar to the preimage of a removed
128
+ file; such a resulting file must not be expressed as a rename from
129
+ other place.
130
115
- "git p4" when interacting with multiple depots at the same time
116
- used to incorrectly drop changes.
131
+ The fix in this patch is broken, unfortunately.
132
+ Will discard.
133
134
--------------------------------------------------
119
-[New Topics]
135
+[Cooking]
136
137
* ea/blame-progress (2015-12-16) 1 commit
138
(merged to 'next' on 2015-12-22 at f8e8643)
@@ -141,12 +157,16 @@ repositories listed at
157
Will merge to 'next'.
158
159
144
-* jk/symbolic-ref (2015-12-28) 2 commits
160
+* jk/symbolic-ref (2015-12-29) 3 commits
161
+ - create_symref: write reflog while holding lock
162
- create_symref: use existing ref-lock code
163
- create_symref: modernize variable names
164
148
- Expecting a reroll.
149
- ($gmane/283032, $gmane/283031)
165
+ The low-level code that is used to create symbolic references has
166
+ been updated to share more code with the code that deals with
167
+ normal references.
168
+
169
+ Will merge to 'next'.
170
171
172
* nd/stop-setenv-work-tree (2015-12-22) 1 commit
@@ -162,7 +182,17 @@ repositories listed at
182
Will merge to 'master'.
183
184
165
-* ep/update-command-substitution-style (2015-12-28) 41 commits
185
+* ep/update-command-substitution-style (2016-01-04) 51 commits
186
+ - t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution
187
+ - t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution
188
+ - t/t5601-clone.sh: use the $( ... ) construct for command substitution
189
+ - t/t5570-git-daemon.sh: use the $( ... ) construct for command substitution
190
+ - t/t5550-http-fetch-dumb.sh: use the $( ... ) construct for command substitution
191
+ - t/t5538-push-shallow.sh: use the $( ... ) construct for command substitution
192
+ - t/t5537-fetch-shallow.sh: use the $( ... ) construct for command substitution
193
+ - t/t5532-fetch-proxy.sh: use the $( ... ) construct for command substitution
194
+ - t/t5530-upload-pack-error.sh: use the $( ... ) construct for command substitution
195
+ - t/t5522-pull-symlink.sh: use the $( ... ) construct for command substitution
196
- t/t5517-push-mirror.sh: use the $( ... ) construct for command substitution
197
- t/t5516-fetch-push.sh: use the $( ... ) construct for command substitution
198
- t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitution
@@ -223,84 +253,18 @@ repositories listed at
253
Will merge to 'next'.
254
255
226
-* ss/user-manual (2015-12-28) 1 commit
256
+* ss/user-manual (2015-12-30) 4 commits
257
+ - user-manual: add addition gitweb information
258
+ - user-manual: add section documenting shallow clones
259
+ - glossary: define the term shallow clone
260
- user-manual: remove temporary branch entry from todo list
261
229
- Drop an old "todo" item by deciding that the change it suggests is
230
- not such a good idea.
262
+ Drop a few old "todo" items by deciding that the change one of them
263
+ suggests is not such a good idea, and doing the change the other
264
+ one suggested to do.
265
266
Will merge to 'next'.
267
234
---------------------------------------------------
235
-[Stalled]
236
-
237
-* kf/http-proxy-auth-methods (2015-11-04) 3 commits
238
- . SQUASH???
239
- . http: use credential API to handle proxy authentication
240
- . http: allow selection of proxy authentication method
241
-
242
- New http.proxyAuthMethod configuration variable can be used to
243
- specify what authentication method to use, as a way to work around
244
- proxies that do not give error response expected by libcurl when
245
- CURLAUTH_ANY is used. Also, the codepath for proxy authentication
246
- has been taught to use credential API to store the authentication
247
- material in user's keyrings.
248
-
249
- I ejected this from pu for the moment, as it conflicts with the
250
- pt/http-socks-proxy topic. That is now in master, so it can
251
- be re-rolled on top.
252
-
253
- Anybody wants to help rerolling this? Otherwise will discard.
254
-
255
-
256
-* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
257
- - t/lib-git-svn: check same httpd module dirs as lib-httpd
258
- - t/lib-httpd: load mod_unixd
259
-
260
- This is the first two commits in a three-patch series $gmane/266962
261
-
262
- Becoming tired of waiting for a reroll.
263
- with updated log message ($gmane/268061).
264
- Will discard.
265
-
266
-
267
-* wp/sha1-name-negative-match (2015-06-08) 2 commits
268
- - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
269
- - test for '!' handling in rev-parse's named commits
270
-
271
- Introduce "branch^{/!-<pattern>}" notation to name a commit
272
- reachable from branch that does not match the given pattern.
273
-
274
- Becoming tired of waiting for a reroll.
275
- ($gmane/271213).
276
- Anybody wants to help rerolling this? Otherwise will discard.
277
-
278
-
279
-* ak/format-patch-odir-config (2015-06-19) 1 commit
280
- - format-patch: introduce format.outputDirectory configuration
281
-
282
- Becoming tired of waiting for a reroll.
283
- Anybody wants to help rerolling this? Otherwise will discard.
284
- ($gmane/272180).
285
-
286
-
287
-* jc/diff-b-m (2015-02-23) 5 commits
288
- . WIPWIP
289
- . WIP: diff-b-m
290
- - diffcore-rename: allow easier debugging
291
- - diffcore-rename.c: add locate_rename_src()
292
- - diffcore-break: allow debugging
293
-
294
- "git diff -B -M" produced incorrect patch when the postimage of a
295
- completely rewritten file is similar to the preimage of a removed
296
- file; such a resulting file must not be expressed as a rename from
297
- other place.
298
-
299
- The fix in this patch is broken, unfortunately.
300
- Will discard.
301
-
302
---------------------------------------------------
303
-[Cooking]
268
269
* nd/ita-cleanup (2015-12-28) 3 commits
270
- grep: make it clear i-t-a entries are ignored
@@ -317,23 +281,23 @@ repositories listed at
281
Will merge to 'next'.
282
283
320
-* cc/untracked (2015-12-15) 10 commits
321
- - dir: do not use untracked cache ident anymore
284
+* cc/untracked (2015-12-29) 10 commits
285
- t7063: add tests for core.untrackedCache
286
- config: add core.untrackedCache
324
- - dir: free untracked cache when removing it
287
+ - dir: simplify untracked cache "ident" field
288
- dir: add remove_untracked_cache()
326
- - dir: add add_untracked_cache()
289
+ - dir: add {new,add}_untracked_cache()
290
- update-index: move 'uc' var declaration
291
- update-index: add untracked cache notifications
292
- update-index: add --test-untracked-cache
293
- update-index: use enum for untracked cache options
294
+ - dir: free untracked cache when removing it
295
296
Update the untracked cache subsystem and change its primary UI from
297
"git update-index" to "git config".
298
335
- Expecting a reroll.
336
- $gmane/282955
299
+ Getting there...
300
+ $gmane/283080
301
302
303
* ep/make-phoney (2015-12-16) 1 commit
@@ -400,7 +364,8 @@ repositories listed at
364
Waiting for review from 'subtree' folks.
365
366
403
-* nd/clear-gitenv-upon-use-of-alias (2015-12-22) 4 commits
367
+* nd/clear-gitenv-upon-use-of-alias (2015-12-29) 5 commits
368
+ - run-command: don't warn on SIGPIPE deaths
369
- git.c: make sure we do not leak GIT_* to alias scripts
370
- setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..
371
- git.c: make it clear save_env() is for alias handling only