What's cooking (2013/07 #08)
Junio C Hamano committed
Jul 22, 2013 at 16:21 UTC
bf8fd109c0529f0aa6d5d15076a8aeba9011696b
1 file changed
+303
-315
whats-cooking.txt
+303
-315
@@ -1,19 +1,27 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2013, #07; Sun, 21)
4
-X-master-at: 805c5a578995db7594ad0751a683bc6422655c29
5
-X-next-at: e2c9e63a26e9480ed73a4f2615121c69962087b4
3
+Subject: What's cooking in git.git (Jul 2013, #08; Mon, 22)
4
+X-master-at: 0bde8c0c1e53e2b2001f4ced58d3e66865758cea
5
+X-next-at: c240c481b4c5d7c300800bb80174c0853d587c6d
6
7
-What's cooking in git.git (Jul 2013, #07; Sun, 21)
7
+What's cooking in git.git (Jul 2013, #08; Mon, 22)
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
-Quite a many documentation clean-up patches that are already in
15
-'master' have been applied to 'maint'. Hopefully 1.8.3.4 will be
16
-the last of the 1.8.3.x maintenance series.
14
+This again is one of those back-to-back issues of "What's cooking"
15
+report, but I expect that the rest of the week will be slower than
16
+usual due to it being the OSCON week, and I wanted to categorize the
17
+topics in flight into those that should be in -rc1 and those that
18
+should cook until the next cycle. Hopefully -rc0 will be tagged
19
+tomorrow with some of the former, but not all, as we would like to
20
+cook topics that are not trivial in 'next' for at least a week or
21
+so. The ones marked as "will merge to master" below are marked as
22
+such because I do not expect major issues in them to be found before
23
+we tag -rc1 (see http://tinyurl.com/gitCal), while ones marked as
24
+"will cook in next" may not be so trivial.
25
26
You can find the changes described here in the integration branches
27
of the repositories listed at
@@ -21,16 +29,91 @@ of the repositories listed at
29
http://git-blame.blogspot.com/p/git-public-repositories.html
30
31
--------------------------------------------------
24
-[New Topics]
32
+[Graduated to "master"]
33
26
-* mm/color-auto-default (2013-07-19) 1 commit
27
- (merged to 'next' on 2013-07-19 at 880d984)
28
- + git add -e: Explicitly specify that patch should have no color
34
+* db/show-ref-head (2013-07-17) 1 commit
35
+ (merged to 'next' on 2013-07-18 at 73797d0)
36
+ + show-ref: make --head always show the HEAD ref
37
30
- A finishing touch to fix breakage to "add -e" caused by defaulting
31
- ui.color to "auto".
38
+ The "--head" option to "git show-ref" was only to add "HEAD" to the
39
+ list of candidate refs to be filtered by the usual rules
40
+ (e.g. "--heads" that only show refs under refs/heads). Change the
41
+ meaning of the option to always show "HEAD" regardless of what
42
+ filtering will be applied to any other ref (this is a backward
43
+ incompatible change, so I may need to add an entry to the Release
44
+ Notes).
45
33
- Will merge to 'master'.
46
+
47
+* dw/request-pull-diag (2013-07-17) 1 commit
48
+ (merged to 'next' on 2013-07-18 at d4406de)
49
+ + request-pull: improve error message for invalid revision args
50
+
51
+
52
+* es/blame-L-breakage (2013-07-17) 6 commits
53
+ (merged to 'next' on 2013-07-18 at cfd871a)
54
+ + blame-options.txt: explain that -L <start> and <end> are optional
55
+ + blame-options.txt: place each -L option variation on its own line
56
+ + t8001/t8002 (blame): add blame -L :funcname tests
57
+ + t8001/t8002 (blame): add blame -L tests
58
+ + t8001/t8002 (blame): modernize style
59
+ + line-range: fix "blame -L X,-N" regression
60
+
61
+ The refactoring made for parsing "-L" option recently to support
62
+ "git log -L" seems to have broken "git blame -L X,-5" to show 5
63
+ lines leading to X.
64
+
65
+
66
+* es/check-mailmap (2013-07-13) 2 commits
67
+ (merged to 'next' on 2013-07-21 at 23c5363)
68
+ + t4203: test check-mailmap command invocation
69
+ + builtin: add git-check-mailmap command
70
+ (this branch is used by es/contacts.)
71
+
72
+ A new command to allow scripts to query the mailmap information.
73
+
74
+
75
+* hv/config-from-blob (2013-07-12) 5 commits
76
+ (merged to 'next' on 2013-07-15 at 9ab7f3f)
77
+ + do not die when error in config parsing of buf occurs
78
+ + teach config --blob option to parse config from database
79
+ + config: make parsing stack struct independent from actual data source
80
+ + config: drop cf validity check in get_next_char()
81
+ + config: factor out config file stack management
82
+
83
+ Allow configuration data to be read from in-tree blob objects,
84
+ which would help working in a bare repository and submodule
85
+ updates.
86
+
87
+
88
+* jc/mailmap-case-insensitivity (2013-07-15) 9 commits
89
+ (merged to 'next' on 2013-07-18 at 83341ac)
90
+ + mailmap: style fixes
91
+ + mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification
92
+ + mailmap: debug: eliminate -Wformat field precision type warning
93
+ + mailmap: debug: fix malformed fprintf() format conversion specification
94
+ + mailmap: debug: fix out-of-order fprintf() arguments
95
+ + mailmap: do not downcase mailmap entries
96
+ + t4203: demonstrate loss of uppercase characters in canonical email
97
+ + mailmap: do not lose single-letter names
98
+ + t4203: demonstrate loss of single-character name in mailmap entry
99
+
100
+ The mailmap mechanism unnecessarily downcased the e-mail addresses
101
+ in the output, and also ignored the human name when it is a single
102
+ character name.
103
+
104
+
105
+* jc/name-rev-exact-ref (2013-07-18) 5 commits
106
+ (merged to 'next' on 2013-07-18 at c8bc00c)
107
+ + describe: fix --contains when a tag is given as input
108
+ + name-rev: differentiate between tags and commits they point at
109
+ (merged to 'next' on 2013-07-11 at fd5b30c)
110
+ + describe: use argv-array
111
+ + name-rev: allow converting the exact object name at the tip of a ref
112
+ + name-ref: factor out name shortening logic from name_ref()
113
+
114
+ Corrects the longstanding sloppiness in the implementation of
115
+ name-rev that conflated "we take commit-ish" and "differences
116
+ between tags and commits do not matter".
117
118
119
* jc/simple-add-must-be-a-no-op (2013-07-19) 1 commit
@@ -40,38 +123,140 @@ of the repositories listed at
123
This detected a mismerge of one of "add-2.0" topics to the 'jch'
124
and 'pu' branches.
125
43
- Will merge to 'master'.
126
127
+* jk/gcc-function-attributes (2013-07-19) 4 commits
128
+ (merged to 'next' on 2013-07-19 at 5f6ad91)
129
+ + Add the LAST_ARG_MUST_BE_NULL macro
130
+ (merged to 'next' on 2013-07-12 at 5a7081f)
131
+ + wt-status: use "format" function attribute for status_printf
132
+ + use "sentinel" function attribute for variadic lists
133
+ + add missing "format" function attributes
134
46
-* jm/doc-ref-prune (2013-07-18) 2 commits
47
- - Documentation: fix git-prune example usage
48
- - Documentation: remove --prune from pack-refs examples
135
+ Use the function attributes extension to catch mistakes in use of
136
+ our own variadic functions that use NULL sentinel at the end
137
+ (i.e. like execl(3)) and format strings (i.e. like printf(3)).
138
50
- Will merge to 'next' and then 'master'.
139
140
+* jk/t0008-sigpipe-fix (2013-07-12) 1 commit
141
+ (merged to 'next' on 2013-07-15 at cead4b2)
142
+ + t0008: avoid SIGPIPE race condition on fifo
143
53
-* rj/sparse (2013-07-21) 1 commit
54
- - Revert "compat/unsetenv.c: Fix a sparse warning"
144
+ Fix for recent test breakage on 'master'.
145
56
- Will merge to 'next' and then 'master'.
146
147
+* jx/clean-interactive (2013-06-26) 16 commits
148
+ (merged to 'next' on 2013-07-12 at 61dd42d)
149
+ + test: run testcases with POSIX absolute paths on Windows
150
+ + test: add t7301 for git-clean--interactive
151
+ + git-clean: add documentation for interactive git-clean
152
+ + git-clean: add ask each interactive action
153
+ + git-clean: add select by numbers interactive action
154
+ + git-clean: add filter by pattern interactive action
155
+ + git-clean: use a git-add-interactive compatible UI
156
+ + git-clean: add colors to interactive git-clean
157
+ + git-clean: show items of del_list in columns
158
+ + git-clean: add support for -i/--interactive
159
+ (merged to 'next' on 2013-06-26 at f7be2d8)
160
+ + git-clean: refactor git-clean into two phases
161
+ + write_name{_quoted_relative,}(): remove redundant parameters
162
+ + quote_path_relative(): remove redundant parameter
163
+ + quote.c: substitute path_relative with relative_path
164
+ + path.c: refactor relative_path(), not only strip prefix
165
+ + test: add test cases for relative_path
166
59
-* sb/traverse-trees-bitmask-variable-name (2013-07-19) 1 commit
60
- - traverse_trees(): clarify return value of the callback
167
+ Add "interactive" mode to "git clean".
168
+
169
+
170
+* mk/upload-pack-off-by-one-dead-code-removal (2013-07-15) 1 commit
171
+ (merged to 'next' on 2013-07-15 at a8f55a2)
172
+ + upload-pack: remove a piece of dead code
173
+
174
+
175
+* mm/color-auto-default (2013-07-19) 1 commit
176
+ (merged to 'next' on 2013-07-19 at 880d984)
177
+ + git add -e: Explicitly specify that patch should have no color
178
+
179
+ A finishing touch to fix breakage to "add -e" caused by defaulting
180
+ ui.color to "auto".
181
+
182
+
183
+* mm/diff-no-patch-synonym-to-s (2013-07-17) 6 commits
184
+ (merged to 'next' on 2013-07-18 at 3b893d6)
185
+ + Documentation/git-log.txt: capitalize section names
186
+ + Documentation: move description of -s, --no-patch to diff-options.txt
187
+ + Documentation/git-show.txt: include common diff options, like git-log.txt
188
+ + diff: allow --patch & cie to override -s/--no-patch
189
+ + diff: allow --no-patch as synonym for -s
190
+ + t4000-diff-format.sh: modernize style
191
+
192
+ "git show -s" was less discoverable than it should have been. It
193
+ now has a more natural looking "git show --no-patch" synonym.
194
+
195
+
196
+* nd/const-struct-cache-entry (2013-07-09) 1 commit
197
+ (merged to 'next' on 2013-07-15 at 9ce0122)
198
+ + Convert "struct cache_entry *" to "const ..." wherever possible
199
+
200
+
201
+* rr/send-email-ssl-verify (2013-07-18) 1 commit
202
+ (merged to 'next' on 2013-07-21 at 62099ff)
203
+ + send-email: be explicit with SSL certificate verification
204
+
205
+ Newer Net::SMTP::SSL module does not want the user programs to use
206
+ the default behaviour to let server certificate go without
207
+ verification, so by default enable the verification with a
208
+ mechanism to turn it off if needed.
209
+
210
+
211
+* sb/parse-object-buffer-eaten (2013-07-17) 1 commit
212
+ (merged to 'next' on 2013-07-18 at 364689c)
213
+ + parse_object_buffer: correct freeing the buffer
214
+
215
+
216
+* tr/do-not-call-submodules-subprojects (2013-07-18) 2 commits
217
+ (merged to 'next' on 2013-07-18 at 6386fd5)
218
+ + show-branch: fix description of --date-order
219
+ + apply, entry: speak of submodules instead of subprojects
220
62
- Will merge to 'next' and then 'master'.
221
+
222
+* tr/fd-gotcha-fixes (2013-07-12) 2 commits
223
+ (merged to 'next' on 2013-07-18 at 30f4fdf)
224
+ + run-command: dup_devnull(): guard against syscalls failing
225
+ + git_mkstemps: correctly test return value of open()
226
+
227
+ Two places we did not check return value (expected to be a file
228
+ descriptor) correctly.
229
+
230
+
231
+* tr/protect-low-3-fds (2013-07-17) 2 commits
232
+ (merged to 'next' on 2013-07-18 at 504d972)
233
+ + git: ensure 0/1/2 are open in main()
234
+ + daemon/shell: refactor redirection of 0/1/2 from /dev/null
235
+
236
+ When "git" is spawned in such a way that any of the low 3 file
237
+ descriptors is closed, our first open() may yield file descriptor 2,
238
+ and writing error message to it would screw things up in a big way.
239
240
--------------------------------------------------
65
-[Stalled]
241
+[New Topics]
242
67
-* jk/fast-import-empty-ls (2013-06-23) 4 commits
68
- - fast-import: allow moving the root tree
69
- - fast-import: allow ls or filecopy of the root tree
70
- - fast-import: set valid mode on root tree in "ls"
71
- - t9300: document fast-import empty path issues
243
+* rj/doc-rev-parse (2013-07-22) 2 commits
244
+ (merged to 'next' on 2013-07-22 at 8188667)
245
+ + rev-parse(1): logically group options
246
+ + rev-parse: remove restrictions on some options
247
+
248
+ Will cook in 'next'.
249
73
- Comments?
250
251
+* ob/typofixes (2013-07-22) 3 commits
252
+ - typofix: in-code comments
253
+ - typofix: documentation
254
+ - typofix: release notes
255
+
256
+ Will merge to 'next' and then to 'master'.
257
+
258
+--------------------------------------------------
259
+[Stalled]
260
261
* tf/gitweb-ss-tweak (2013-07-15) 4 commits
262
- gitweb: make search help link less ugly
@@ -192,63 +377,57 @@ of the repositories listed at
377
--------------------------------------------------
378
[Cooking]
379
195
-* mh/multimail (2013-07-15) 2 commits
196
- - post-receive-email: deprecate script in favor of git-multimail
197
- - git-multimail: an improved replacement for post-receive-email
380
+* jk/fast-import-empty-ls (2013-06-23) 4 commits
381
+ - fast-import: allow moving the root tree
382
+ - fast-import: allow ls or filecopy of the root tree
383
+ - fast-import: set valid mode on root tree in "ls"
384
+ - t9300: document fast-import empty path issues
385
199
- An enhanced "post-receive" hook to send e-mail messages.
386
+ Will merge to 'next'.
387
201
- I tend to agree that the wording of the tip one is a bit too
202
- strong. An old script does not necessarily have to be avoided by
203
- its existing users only because it has not got updates for a long
204
- time.
388
389
+* jm/doc-ref-prune (2013-07-18) 2 commits
390
+ (merged to 'next' on 2013-07-22 at 414e6ea)
391
+ + Documentation: fix git-prune example usage
392
+ + Documentation: remove --prune from pack-refs examples
393
207
-* db/show-ref-head (2013-07-17) 1 commit
208
- (merged to 'next' on 2013-07-18 at 73797d0)
209
- + show-ref: make --head always show the HEAD ref
394
+ Will merge to 'master'.
395
211
- The "--head" option to "git show-ref" was only to add "HEAD" to the
212
- list of candidate refs to be filtered by the usual rules
213
- (e.g. "--heads" that only show refs under refs/heads). Change the
214
- meaning of the option to always show "HEAD" regardless of what
215
- filtering will be applied to any other ref (this is a backward
216
- incompatible change, so I may need to add an entry to the Release
217
- Notes).
396
+
397
+* rj/sparse (2013-07-21) 1 commit
398
+ (merged to 'next' on 2013-07-22 at 24efece)
399
+ + Revert "compat/unsetenv.c: Fix a sparse warning"
400
401
Will merge to 'master'.
402
403
222
-* dw/request-pull-diag (2013-07-17) 1 commit
223
- (merged to 'next' on 2013-07-18 at d4406de)
224
- + request-pull: improve error message for invalid revision args
404
+* sb/traverse-trees-bitmask-variable-name (2013-07-19) 1 commit
405
+ (merged to 'next' on 2013-07-22 at be3227c)
406
+ + traverse_trees(): clarify return value of the callback
407
408
Will merge to 'master'.
409
410
229
-* es/blame-L-breakage (2013-07-17) 6 commits
230
- (merged to 'next' on 2013-07-18 at cfd871a)
231
- + blame-options.txt: explain that -L <start> and <end> are optional
232
- + blame-options.txt: place each -L option variation on its own line
233
- + t8001/t8002 (blame): add blame -L :funcname tests
234
- + t8001/t8002 (blame): add blame -L tests
235
- + t8001/t8002 (blame): modernize style
236
- + line-range: fix "blame -L X,-N" regression
411
+* mh/multimail (2013-07-15) 2 commits
412
+ - post-receive-email: deprecate script in favor of git-multimail
413
+ - git-multimail: an improved replacement for post-receive-email
414
238
- The refactoring made for parsing "-L" option recently to support
239
- "git log -L" seems to have broken "git blame -L X,-5" to show 5
240
- lines leading to X.
415
+ An enhanced "post-receive" hook to send e-mail messages.
416
242
- Will merge to 'master'.
417
+ I tend to agree that the wording of the tip one is a bit too
418
+ strong. An old script does not necessarily have to be avoided by
419
+ its existing users only because it has not got updates for a long
420
+ time.
421
422
423
* jc/diff-filter-negation (2013-07-19) 6 commits
246
- - diff: deprecate -q option to diff-files
247
- - diff: allow lowercase letter to specify what change class to exclude
248
- - diff: reject unknown change class given to --diff-filter
249
- - diff: preparse --diff-filter string argument
250
- - diff: factor out match_filter()
251
- - diff: pass the whole diff_options to diffcore_apply_filter()
424
+ (merged to 'next' on 2013-07-22 at 80d167d)
425
+ + diff: deprecate -q option to diff-files
426
+ + diff: allow lowercase letter to specify what change class to exclude
427
+ + diff: reject unknown change class given to --diff-filter
428
+ + diff: preparse --diff-filter string argument
429
+ + diff: factor out match_filter()
430
+ + diff: pass the whole diff_options to diffcore_apply_filter()
431
(this branch is used by jc/hold-diff-remove-q-synonym-for-no-deletion.)
432
433
Teach "git diff --diff-filter" to express "I do not want to see
@@ -257,7 +436,7 @@ of the repositories listed at
436
everything but deletion) and deprecate "diff-files -q" which did
437
the same thing as "--diff-filter=d".
438
260
- Will merge to 'next'.
439
+ Will cook in 'next'.
440
441
442
* mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit
@@ -267,40 +446,28 @@ of the repositories listed at
446
447
448
* ml/avoid-using-grep-on-crlf-files (2013-07-18) 1 commit
270
- - test-lib.sh - define and use GREP_STRIPS_CR
449
+ (merged to 'next' on 2013-07-22 at f861472)
450
+ + test-lib.sh - define and use GREP_STRIPS_CR
451
452
On systems that understand a CRLF as a line ending, tests in this
453
script that worked on files with CRLF line endings using "grep" to
454
extract matching lines may lose the CR at the end of lines that
455
match, causing the actual output not to match the expected output.
456
277
- Will merge to 'next'.
457
+ Will merge to 'master'.
458
459
460
* ml/cygwin-updates (2013-07-21) 4 commits
281
- - cygwin: stop forcing core.filemode=false
282
- - Cygwin 1.7 supports mmap
283
- - Cygwin 1.7 has thread-safe pread
284
- - Cygwin 1.7 needs compat/regex
461
+ (merged to 'next' on 2013-07-22 at e9c9872)
462
+ + cygwin: stop forcing core.filemode=false
463
+ + Cygwin 1.7 supports mmap
464
+ + Cygwin 1.7 has thread-safe pread
465
+ + Cygwin 1.7 needs compat/regex
466
467
The tip one does _not_ revert c869753e (Force core.filemode to
468
false on Cygwin., 2006-12-30) on purpose, so that people can
469
still retain the old behaviour if they wanted to.
470
290
- Will merge to 'next'.
291
-
292
-
293
-* mm/diff-no-patch-synonym-to-s (2013-07-17) 6 commits
294
- (merged to 'next' on 2013-07-18 at 3b893d6)
295
- + Documentation/git-log.txt: capitalize section names
296
- + Documentation: move description of -s, --no-patch to diff-options.txt
297
- + Documentation/git-show.txt: include common diff options, like git-log.txt
298
- + diff: allow --patch & cie to override -s/--no-patch
299
- + diff: allow --no-patch as synonym for -s
300
- + t4000-diff-format.sh: modernize style
301
-
302
- "git show -s" was less discoverable than it should be.
303
-
471
Will merge to 'master'.
472
473
@@ -361,14 +528,15 @@ of the repositories listed at
528
529
530
* rh/template-updates (2013-07-15) 3 commits
364
- - templates: spell ASCII in uppercase in pre-commit hook
365
- - templates: Reformat pre-commit hook's message
366
- - templates: Use heredoc in pre-commit hook
531
+ (merged to 'next' on 2013-07-22 at 53dffdd)
532
+ + templates: spell ASCII in uppercase in pre-commit hook
533
+ + templates: Reformat pre-commit hook's message
534
+ + templates: Use heredoc in pre-commit hook
535
536
This is an earlier part of a 6 patch series, with log message
537
corrected.
538
371
- Will merge to 'next'.
539
+ Will merge to 'master'.
540
541
542
* sb/misc-fixes (2013-07-15) 3 commits
@@ -382,56 +550,6 @@ of the repositories listed at
550
Will merge to 'master'.
551
552
385
-* sb/parse-object-buffer-eaten (2013-07-17) 1 commit
386
- (merged to 'next' on 2013-07-18 at 364689c)
387
- + parse_object_buffer: correct freeing the buffer
388
-
389
- Will merge to 'master'.
390
-
391
-
392
-* tr/do-not-call-submodules-subprojects (2013-07-18) 2 commits
393
- (merged to 'next' on 2013-07-18 at 6386fd5)
394
- + show-branch: fix description of --date-order
395
- + apply, entry: speak of submodules instead of subprojects
396
-
397
- Will merge to 'master'.
398
-
399
-
400
-* tr/protect-low-3-fds (2013-07-17) 2 commits
401
- (merged to 'next' on 2013-07-18 at 504d972)
402
- + git: ensure 0/1/2 are open in main()
403
- + daemon/shell: refactor redirection of 0/1/2 from /dev/null
404
-
405
- When "git" is spawned in such a way that any of the low 3 file
406
- descriptors is closed, our first open() may yield file descriptor 2,
407
- and writing error message to it would screw things up in a big way.
408
-
409
- Will merge to 'master'.
410
-
411
-
412
-* rr/send-email-ssl-verify (2013-07-18) 1 commit
413
- (merged to 'next' on 2013-07-21 at 62099ff)
414
- + send-email: be explicit with SSL certificate verification
415
-
416
- Newer Net::SMTP::SSL module does not want the user programs to use
417
- the default behaviour to let server certificate go without
418
- verification, so by default enable the verification with a
419
- mechanism to turn it off if needed.
420
-
421
- Will merge to 'master'.
422
-
423
-
424
-* es/check-mailmap (2013-07-13) 2 commits
425
- (merged to 'next' on 2013-07-21 at 23c5363)
426
- + t4203: test check-mailmap command invocation
427
- + builtin: add git-check-mailmap command
428
- (this branch is used by es/contacts.)
429
-
430
- A new command to allow scripts to query the mailmap information.
431
-
432
- Will merge to 'master'.
433
-
434
-
553
* jc/check-x-z (2013-07-11) 4 commits
554
(merged to 'next' on 2013-07-15 at 62751bc)
555
+ check-attr -z: a single -z should apply to both input and output
@@ -448,73 +566,25 @@ of the repositories listed at
566
screams before deciding if we want to do anything to help existing
567
users (there may be none).
568
451
- Waiting for failure reports ;-)
569
+ Will cook in 'next'.
570
571
572
* jk/cat-file-batch-optim (2013-07-18) 9 commits
455
- - Fix some sparse warnings
456
- - sha1_object_info_extended: pass object_info to helpers
457
- - sha1_object_info_extended: make type calculation optional
458
- - packed_object_info: make type lookup optional
459
- - packed_object_info: hoist delta type resolution to helper
460
- - sha1_loose_object_info: make type lookup optional
461
- - sha1_object_info_extended: rename "status" to "type"
462
- - cat-file: disable object/refname ambiguity check for batch mode
463
- - Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim
573
+ (merged to 'next' on 2013-07-22 at 965897c)
574
+ + Fix some sparse warnings
575
+ + sha1_object_info_extended: pass object_info to helpers
576
+ + sha1_object_info_extended: make type calculation optional
577
+ + packed_object_info: make type lookup optional
578
+ + packed_object_info: hoist delta type resolution to helper
579
+ + sha1_loose_object_info: make type lookup optional
580
+ + sha1_object_info_extended: rename "status" to "type"
581
+ + cat-file: disable object/refname ambiguity check for batch mode
582
+ + Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim
583
584
If somebody wants to only know on-disk footprint of an object
585
without having to know its type or payload size, we can bypass a
586
lot of code to cheaply learn it.
587
469
- Will merge to 'next'.
470
-
471
-
472
-* jk/t0008-sigpipe-fix (2013-07-12) 1 commit
473
- (merged to 'next' on 2013-07-15 at cead4b2)
474
- + t0008: avoid SIGPIPE race condition on fifo
475
-
476
- Fix for recent test breakage on 'master'.
477
-
478
- Will merge to 'master'.
479
-
480
-
481
-* mk/upload-pack-off-by-one-dead-code-removal (2013-07-15) 1 commit
482
- (merged to 'next' on 2013-07-15 at a8f55a2)
483
- + upload-pack: remove a piece of dead code
484
-
485
- Will merge to 'master'.
486
-
487
-
488
-* tr/fd-gotcha-fixes (2013-07-12) 2 commits
489
- (merged to 'next' on 2013-07-18 at 30f4fdf)
490
- + run-command: dup_devnull(): guard against syscalls failing
491
- + git_mkstemps: correctly test return value of open()
492
-
493
- Two places we did not check return value (expected to be a file
494
- descriptor) correctly.
495
-
496
- Will merge to 'master'.
497
-
498
-
499
-* jc/mailmap-case-insensitivity (2013-07-15) 9 commits
500
- (merged to 'next' on 2013-07-18 at 83341ac)
501
- + mailmap: style fixes
502
- + mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification
503
- + mailmap: debug: eliminate -Wformat field precision type warning
504
- + mailmap: debug: fix malformed fprintf() format conversion specification
505
- + mailmap: debug: fix out-of-order fprintf() arguments
506
- + mailmap: do not downcase mailmap entries
507
- + t4203: demonstrate loss of uppercase characters in canonical email
508
- + mailmap: do not lose single-letter names
509
- + t4203: demonstrate loss of single-character name in mailmap entry
510
-
511
- The mailmap mechanism unnecessarily downcased the e-mail addresses
512
- in the output, and also ignored the human name when it is a single
513
- character name.
514
-
515
- This now has become Eric Sunshine's series, even though it still is
516
- under jc/ hierarchy.
517
-
588
Will merge to 'master'.
589
590
@@ -525,65 +595,24 @@ of the repositories listed at
595
Allow fetch.prune and remote.*.prune configuration variables to be set,
596
and "git fetch" to behave as if "--prune" is given.
597
528
- Will merge to 'master'.
529
-
530
-
531
-* jk/gcc-function-attributes (2013-07-19) 4 commits
532
- (merged to 'next' on 2013-07-19 at 5f6ad91)
533
- + Add the LAST_ARG_MUST_BE_NULL macro
534
- (merged to 'next' on 2013-07-12 at 5a7081f)
535
- + wt-status: use "format" function attribute for status_printf
536
- + use "sentinel" function attribute for variadic lists
537
- + add missing "format" function attributes
538
-
539
- Use the function attributes extension to catch mistakes in use of
540
- our own variadic functions that use NULL sentinel at the end
541
- (i.e. like execl(3)) and format strings (i.e. like printf(3)).
598
+ "git fetch" that honors remote.*.prune is fine, but I wonder if we
599
+ should somehow make "git push" aware of it as well. Perhaps
600
+ remote.*.prune should not be just a boolean, but a 4-way "none",
601
+ "push", "fetch", "both"?
602
543
- Will merge to 'master'.
603
+ Will cook in 'next'.
604
605
546
-* km/http-curl-config-per-url (2013-07-21) 5 commits
547
- . config: allow http.<url>.* any user matching
548
- . tests: add new test for the url_normalize function
549
- . config: improve support for http.<url>.* settings
550
- . config: add support for http.<url>.* settings
551
- . http.c: fix parsing of http.sslCertPasswordProtected variable
606
+* km/http-curl-config-per-url (2013-07-22) 5 commits
607
+ - config: allow http.<url>.* any user matching
608
+ - tests: add new test for the url_normalize function
609
+ - config: improve support for http.<url>.* settings
610
+ - config: add support for http.<url>.* settings
611
+ - http.c: fix parsing of http.sslCertPasswordProtected variable
612
613
Allows custom curl configuration per URL when talking over http.
554
- Tentatively ejected as I did not seem to have received some binary
555
- files correctly.
556
-
557
-
558
-* hv/config-from-blob (2013-07-12) 5 commits
559
- (merged to 'next' on 2013-07-15 at 9ab7f3f)
560
- + do not die when error in config parsing of buf occurs
561
- + teach config --blob option to parse config from database
562
- + config: make parsing stack struct independent from actual data source
563
- + config: drop cf validity check in get_next_char()
564
- + config: factor out config file stack management
565
-
566
- Allow configuration data to be read from in-tree blob objects,
567
- which would help working in a bare repository and submodule
568
- updates.
569
-
570
- Will merge to 'master'.
614
572
-
573
-* jc/name-rev-exact-ref (2013-07-18) 5 commits
574
- (merged to 'next' on 2013-07-18 at c8bc00c)
575
- + describe: fix --contains when a tag is given as input
576
- + name-rev: differentiate between tags and commits they point at
577
- (merged to 'next' on 2013-07-11 at fd5b30c)
578
- + describe: use argv-array
579
- + name-rev: allow converting the exact object name at the tip of a ref
580
- + name-ref: factor out name shortening logic from name_ref()
581
-
582
- Corrects the longstanding sloppiness in the implementation of
583
- name-rev that conflated "we take commit-ish" and "differences
584
- between tags and commits do not matter".
585
-
586
- Will merge to 'master'.
615
+ Will merge to 'next'.
616
617
618
* km/svn-1.8-serf-only (2013-07-18) 3 commits
@@ -596,7 +625,7 @@ of the repositories listed at
625
Subversion 1.8.0 that was recently released breaks older subversion
626
clients coming over http/https in various ways.
627
599
- Will cook for a while.
628
+ Will cook in 'next'.
629
630
631
* tr/merge-recursive-index-only (2013-07-07) 3 commits
@@ -604,12 +633,7 @@ of the repositories listed at
633
- merge-recursive: untangle double meaning of o->call_depth
634
- merge-recursive: remove dead conditional in update_stages()
635
607
- What's the status of this one?
608
-
609
- I am not particularly fond of the second patch that conceptually
610
- allows updating working tree during a virtual merge (i.e. addition
611
- of o->no_worktree is fine, but there needs a way to make sure it is
612
- never set to false when o->depth is not zero).
636
+ Will hold, until we get any user.
637
638
639
* jc/push-cas (2013-07-17) 6 commits
@@ -637,36 +661,27 @@ of the repositories listed at
661
it is a weaker and more controlled form of "--force" that is used
662
to defeat the usual "must fast-forward" safety.
663
640
-
641
-* nd/const-struct-cache-entry (2013-07-09) 1 commit
642
- (merged to 'next' on 2013-07-15 at 9ce0122)
643
- + Convert "struct cache_entry *" to "const ..." wherever possible
644
-
645
- Will merge to 'master'.
664
+ Will redo one more time.
665
666
667
* es/contacts (2013-07-21) 5 commits
649
- - contrib: contacts: add documentation
650
- - contrib: contacts: add mailmap support
651
- - contrib: contacts: interpret committish akin to format-patch
652
- - contrib: contacts: add ability to parse from committish
653
- - contrib: add git-contacts helper
654
- (this branch uses es/check-mailmap.)
668
+ (merged to 'next' on 2013-07-22 at a78c3d6)
669
+ + contrib: contacts: add documentation
670
+ + contrib: contacts: add mailmap support
671
+ + contrib: contacts: interpret committish akin to format-patch
672
+ + contrib: contacts: add ability to parse from committish
673
+ + contrib: add git-contacts helper
674
675
A helper to read from a set of format-patch output files or a range
676
of commits and find those who may have insights to the code that
677
the changes touch by running a series of "git blame" commands.
678
660
- Still needs to add mailmap support and other niceties but the
661
- basics already look sound, and the enhancements can be done
662
- in-tree. Assuming that "git contact" is something we may want to
663
- have as a member of the official set of commands someday, that is.
664
-
665
- Will merge to 'next'.
679
+ Will merge to 'master'.
680
681
682
* jc/pull-training-wheel (2013-07-19) 1 commit
669
- - pull: require choice between rebase/merge on non-fast-forward pull
683
+ (merged to 'next' on 2013-07-22 at 748180e)
684
+ + pull: require choice between rebase/merge on non-fast-forward pull
685
686
Make "git pull" (without arguments that say what branch to
687
integrate from where) refuse with "it does not fast forward; choose
@@ -679,7 +694,7 @@ of the repositories listed at
694
695
for full discussion.
696
682
- Will merge to 'next'.
697
+ Will cook in 'next'.
698
699
700
* rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit
@@ -704,39 +719,12 @@ of the repositories listed at
719
720
721
* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
707
- - refs: do not invalidate the packed-refs cache unnecessarily
722
+ (merged to 'next' on 2013-07-22 at 144d135)
723
+ + refs: do not invalidate the packed-refs cache unnecessarily
724
725
This requires the platform lstat() to be correct to avoid false
726
negatives.
727
712
- Will merge to 'next'.
713
-
714
-
715
-* jx/clean-interactive (2013-06-26) 16 commits
716
- (merged to 'next' on 2013-07-12 at 61dd42d)
717
- + test: run testcases with POSIX absolute paths on Windows
718
- + test: add t7301 for git-clean--interactive
719
- + git-clean: add documentation for interactive git-clean
720
- + git-clean: add ask each interactive action
721
- + git-clean: add select by numbers interactive action
722
- + git-clean: add filter by pattern interactive action
723
- + git-clean: use a git-add-interactive compatible UI
724
- + git-clean: add colors to interactive git-clean
725
- + git-clean: show items of del_list in columns
726
- + git-clean: add support for -i/--interactive
727
- (merged to 'next' on 2013-06-26 at f7be2d8)
728
- + git-clean: refactor git-clean into two phases
729
- + write_name{_quoted_relative,}(): remove redundant parameters
730
- + quote_path_relative(): remove redundant parameter
731
- + quote.c: substitute path_relative with relative_path
732
- + path.c: refactor relative_path(), not only strip prefix
733
- + test: add test cases for relative_path
734
-
735
- Add "interactive" mode to "git clean".
736
-
737
- The early part to refactor relative path related helper functions
738
- looked sensible.
739
-
728
Will merge to 'master'.
729
730
@@ -771,4 +759,4 @@ of the repositories listed at
759
- diff: remove "diff-files -q" in a version of Git in a distant future
760
(this branch uses jc/diff-filter-negation.)
761
774
- This obviously has to wait until a distant future.
762
+ Will cook in 'next' until a distant future.