@matheusbsbs / matheus-bagliano / commits / 23666c5c39

What's cooking (2013/03 #05)

Junio C Hamano committed Mar 18, 2013 at 14:05 UTC 23666c5c3925424ab23758608b07d0e232ab54c4
1 file changed +348 -122
whats-cooking.txt
+348 -122
@@ -1,19 +1,32 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Mar 2013, #04; Wed, 13)
4 -X-master-at: 239222f587ed06f96d90dd71c66d80a2b1e3dc9f
5 -X-next-at: 36b63d62840a512828134a9665bea5dcf8279464
3 +Subject: What's cooking in git.git (Mar 2013, #05; Mon, 18)
4 +X-master-at: 1c71541ddd51968ca2957063b00da42941d13d98
5 +X-next-at: 4a4606479e7f1a5f817dd3a6582cd086aa0e70c2
6
7 -What's cooking in git.git (Mar 2013, #04; Wed, 13)
7 +What's cooking in git.git (Mar 2013, #05; Mon, 18)
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 tip of the master is at v1.8.2. We have already many topics
15 -lined up for the next cycle, so after a few days to calm down, we
16 -will see exciting changes on 'master' starting from next week.
14 +We have been scheduling each cycle to last for 8-10 weeks, but at
15 +the end of 1.8.2 cycle we already have quite a many topics already
16 +in flight. I am wondering perhaps we should cut this cycle a bit
17 +short by tagging -rc0 shortly after we have those we already have
18 +been cooking graduated to 'master' (we already have 200 non-merge
19 +commits on 'next').
20 +
21 +This issue classifies these topics in flight into three categories:
22 +Trivially Safe, Safe and Risky. "Risky" does not mean the topic is
23 +with known breakages, but just that my gut feeling tells it would
24 +not be surprising if there were unintended consequences, either
25 +these topics touch fairly deep part of the codepath, their design
26 +may not match some obscure but still valid use cases, or for some
27 +other unforeseen reason. Feeding this message to "cook -w" (found
28 +in 'todo' branch) script may make the overall picture easier to
29 +review.
30
31 You can find the changes described here in the integration branches
32 of the repositories listed at
@@ -23,10 +36,187 @@ of the repositories listed at
36 --------------------------------------------------
37 [New Topics]
38
26 -* ph/tag-force-no-warn-on-creation (2013-03-13) 1 commit
27 - - tag: --force does not have to warn when creating tags
39 +* ap/combine-diff-ignore-whitespace (2013-03-14) 1 commit
40 + (merged to 'next' on 2013-03-18 at 32435a6)
41 + + Allow combined diff to ignore white-spaces
42 +
43 + Teach "diff --cc" output to honor options to ignore various forms
44 + of whitespace changes.
45 +
46 + Will merge to 'master' in the 4th batch (Safe).
47 +
48 +
49 +* jk/checkout-attribute-lookup (2013-03-14) 2 commits
50 + (merged to 'next' on 2013-03-15 at 28bd515)
51 + + entry: fix filter lookup
52 + + t2003: modernize style
53 +
54 + Codepath to stream blob object contents directly from the object
55 + store to filesystem did not use the correct path to find conversion
56 + filters when writing to temporary files.
57 +
58 + Will merge to 'master' in the 4th batch (Safe).
59 +
60 +
61 +* jk/difftool-dir-diff-edit-fix (2013-03-14) 3 commits
62 + (merged to 'next' on 2013-03-15 at add7b77)
63 + + difftool --dir-diff: symlink all files matching the working tree
64 + + difftool: avoid double slashes in symlink targets
65 + + git-difftool(1): fix formatting of --symlink description
66 +
67 + "git difftool --dir-diff" made symlinks to working tree files when
68 + preparing a temporary directory structure, so that accidental edits
69 + of these files in the difftool are reflected back to the working
70 + tree, but the logic to decide when to do so was not quite right.
71 +
72 + Will merge to 'master' in the 4th batch (Safe).
73 +
74 +
75 +* lf/setup-prefix-pathspec (2013-03-14) 2 commits
76 + (merged to 'next' on 2013-03-14 at 7552204)
77 + + setup.c: check that the pathspec magic ends with ")"
78 + + setup.c: stop prefix_pathspec() from looping past the end of string
79 +
80 + Rerolls aw/setup-prefix-pathspec.
81 +
82 + Will merge to 'master' in the 3rd batch (Safe).
83 +
84 +
85 +* tb/document-status-u-tradeoff (2013-03-16) 2 commits
86 + (merged to 'next' on 2013-03-18 at 2fc53b0)
87 + + status: advise to consider use of -u when read_directory takes too long
88 + + git status: document trade-offs in choosing parameters to the -u option
89 +
90 + Suggest users to look into using--untracked=no option when "git
91 + status" takes too long.
92 +
93 + Will merge to 'master' in the 2nd batch (Trivially Safe).
94 +
95 +
96 +* jk/fully-peeled-packed-ref (2013-03-18) 4 commits
97 + (merged to 'next' on 2013-03-18 at cbcfa32)
98 + + pack-refs: add fully-peeled trait
99 + + pack-refs: write peeled entry for non-tags
100 + + use parse_object_or_die instead of die("bad object")
101 + + avoid segfaults on parse_object failure
102 +
103 + Not that we do not actively encourage having annotated tags outside
104 + refs/tags/ hierarchy, but they were not advertised correctly to the
105 + ls-remote and fetch with recent version of Git.
106 +
107 + Will merge to 'master' in the 3rd batch (Safe).
108 +
109 +
110 +* jk/peel-ref (2013-03-16) 3 commits
111 + (merged to 'next' on 2013-03-18 at 77f0e4e)
112 + + upload-pack: load non-tip "want" objects from disk
113 + + upload-pack: make sure "want" objects are parsed
114 + + upload-pack: drop lookup-before-parse optimization
115 +
116 + Recent optimization broke shallow clones.
117 +
118 + Will merge to 'master' in the 3rd batch (Safe).
119
29 - Will cook in 'next'.
120 +
121 +* nd/index-pack-l10n-buf-overflow (2013-03-16) 1 commit
122 + (merged to 'next' on 2013-03-18 at b7a4a8e)
123 + + index-pack: fix buffer overflow caused by translations
124 +
125 + Will merge to 'master' in the 2nd batch (Trivially Safe).
126 +
127 +
128 +* nd/magic-pathspecs (2013-03-15) 45 commits
129 + - Rename field "raw" to "_raw" in struct pathspec
130 + - pathspec: support :(glob) syntax
131 + - pathspec: make --literal-pathspecs disable pathspec magic
132 + - pathspec: support :(literal) syntax for noglob pathspec
133 + - Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
134 + - parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
135 + - parse_pathspec: make sure the prefix part is wildcard-free
136 + - tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
137 + - Remove match_pathspec() in favor of match_pathspec_depth()
138 + - Remove init_pathspec() in favor of parse_pathspec()
139 + - Remove diff_tree_{setup,release}_paths
140 + - Convert common_prefix() to use struct pathspec
141 + - Convert add_files_to_cache to take struct pathspec
142 + - Convert {read,fill}_directory to take struct pathspec
143 + - Convert refresh_index to take struct pathspec
144 + - Convert report_path_error to take struct pathspec
145 + - checkout: convert read_tree_some to take struct pathspec
146 + - Convert unmerge_cache to take struct pathspec
147 + - Convert run_add_interactive to use struct pathspec
148 + - Convert read_cache_preload() to take struct pathspec
149 + - reset: convert to use parse_pathspec
150 + - add: convert to use parse_pathspec
151 + - check-ignore: convert to use parse_pathspec
152 + - archive: convert to use parse_pathspec
153 + - ls-files: convert to use parse_pathspec
154 + - rm: convert to use parse_pathspec
155 + - checkout: convert to use parse_pathspec
156 + - rerere: convert to use parse_pathspec
157 + - status: convert to use parse_pathspec
158 + - commit: convert to use parse_pathspec
159 + - clean: convert to use parse_pathspec
160 + - Guard against new pathspec magic in pathspec matching code
161 + - parse_pathspec: support prefixing original patterns
162 + - parse_pathspec: support stripping/checking submodule paths
163 + - parse_pathspec: support stripping submodule trailing slashes
164 + - parse_pathspec: a special flag for max_depth feature
165 + - Convert some get_pathspec() calls to parse_pathspec()
166 + - parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
167 + - parse_pathspec: save original pathspec for reporting
168 + - Add parse_pathspec() that converts cmdline args to struct pathspec
169 + - pathspec: add copy_pathspec
170 + - pathspec: i18n-ize error strings in pathspec parsing code
171 + - Move struct pathspec and related functions to pathspec.[ch]
172 + - clean: remove unused variable "seen"
173 + - setup.c: check that the pathspec magic ends with ")"
174 +
175 + Migrate the rest of codebase to use "struct pathspec" more.
176 +
177 + Expecting a reroll, but this is overall going in the right direction.
178 + $gmane/218385
179 +
180 +
181 +* nd/preallocate-hash (2013-03-16) 1 commit
182 + (merged to 'next' on 2013-03-18 at 0b928c5)
183 + + Preallocate hash tables when the number of inserts are known in advance
184 +
185 + When we know approximately how many entries we will have in the
186 + hash-table, it makes sense to size the hash table to that number
187 + from the beginning to avoid unnecessary rehashing.
188 +
189 + Will merge to 'master' in the 2nd batch (Trivially Safe).
190 +
191 +
192 +* pe/pull-rebase-v-q (2013-03-16) 1 commit
193 + (merged to 'next' on 2013-03-18 at 8e17883)
194 + + pull: Apply -q and -v options to rebase mode as well
195 +
196 + Will merge to 'master' in the 2nd batch (Safe).
197 +
198 +
199 +* rs/archive-zip-raw-compression (2013-03-16) 1 commit
200 + (merged to 'next' on 2013-03-18 at 229897a)
201 + + archive-zip: use deflateInit2() to ask for raw compressed data
202 + (this branch uses rs/zip-compresssed-size-with-export-subst.)
203 +
204 + Will merge to 'master' in the 4th batch (Safe).
205 +
206 +
207 +* jk/fast-export-object-lookup (2013-03-17) 2 commits
208 + (merged to 'next' on 2013-03-18 at 98c436d)
209 + + fast-export: do not load blob objects twice
210 + + fast-export: rename handle_object function
211 +
212 + Will merge to 'master' in the 3rd batch (Safe).
213 +
214 +
215 +* sw/safe-create-leading-dir-race (2013-03-17) 2 commits
216 + - SQUASH???
217 + - safe_create_leading_directories: fix race that could give a false negative
218 +
219 + Waiting for response to review comments.
220
221 --------------------------------------------------
222 [Stalled]
@@ -82,46 +272,58 @@ of the repositories listed at
272 --------------------------------------------------
273 [Cooking]
274
85 -* nd/branch-show-rebase-bisect-state (2013-03-13) 6 commits
86 - - branch: show more information when HEAD is detached
87 - - status: show more info than "currently not on any branch"
88 - - wt-status: move wt_status_get_state() out to wt_status_print()
89 - - wt-status: split wt_status_state parsing function out
90 - - wt-status: move strbuf into read_and_strip_branch()
91 - - Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state
275 +* ph/tag-force-no-warn-on-creation (2013-03-13) 1 commit
276 + (merged to 'next' on 2013-03-14 at 809e9ae)
277 + + tag: --force does not have to warn when creating tags
278 +
279 + Will merge to 'master' in the 3rd batch (Safe).
280 +
281 +
282 +* nd/branch-show-rebase-bisect-state (2013-03-16) 6 commits
283 + (merged to 'next' on 2013-03-18 at 4a46064)
284 + + branch: show more information when HEAD is detached
285 + + status: show more info than "currently not on any branch"
286 + + wt-status: move wt_status_get_state() out to wt_status_print()
287 + + wt-status: split wt_status_state parsing function out
288 + + wt-status: move strbuf into read_and_strip_branch()
289 + + Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state
290 (this branch uses jc/reflog-reverse-walk.)
291
94 - The changes look sound, but some patches need better description.
292 + Will merge to 'master' in the 4th batch (Safe).
293
294
295 * kb/p4merge (2013-03-13) 2 commits
98 - - mergetools/p4merge: create a base if none available
99 - - mergetools/p4merge: swap LOCAL and REMOTE
296 + (merged to 'next' on 2013-03-14 at 6d390d4)
297 + + mergetools/p4merge: create a base if none available
298 + + mergetools/p4merge: swap LOCAL and REMOTE
299
101 - Looked reasonable.
300 + Adjust the order mergetools feeds the files to the p4merge backend
301 + to match the p4 convention.
302
103 - Will merge to 'next'.
303 + Will merge to 'master' in the 3rd batch (Safe).
304
305
306 * jc/maint-push-refspec-default-doc (2013-03-08) 1 commit
107 - - Documentation/git-push: clarify the description of defaults
307 + (merged to 'next' on 2013-03-14 at 912eb14)
308 + + Documentation/git-push: clarify the description of defaults
309
310 Clarify in the documentation "what" gets pushed to "where" when the
311 command line to "git push" does not say these explicitly.
312
112 - Will merge to 'next'.
313 + Will merge to 'master' in the 2nd batch (Trivially Safe).
314
315
316 * jc/reflog-reverse-walk (2013-03-08) 3 commits
116 - - reflog: add for_each_reflog_ent_reverse() API
117 - - for_each_recent_reflog_ent(): simplify opening of a reflog file
118 - - for_each_reflog_ent(): extract a helper to process a single entry
317 + (merged to 'next' on 2013-03-14 at 3f2ed32)
318 + + reflog: add for_each_reflog_ent_reverse() API
319 + + for_each_recent_reflog_ent(): simplify opening of a reflog file
320 + + for_each_reflog_ent(): extract a helper to process a single entry
321 (this branch is used by nd/branch-show-rebase-bisect-state.)
322
323 An internal function used to implement "git checkout @{-1}" was
324 hard to use correctly.
325
124 - Will merge to 'next'.
326 + Will merge to 'master' in the 3rd batch (Safe).
327
328
329 * jk/alias-in-bare (2013-03-08) 3 commits
@@ -133,7 +335,7 @@ of the repositories listed at
335 An aliased command spawned from a bare repository that does not say
336 it is bare with "core.bare = yes" is treated as non-bare by mistake.
337
136 - Will cook in 'next'.
338 + Will merge to 'master' in the 3rd batch (Safe).
339
340
341 * pw/p4-symlinked-root (2013-03-11) 3 commits
@@ -142,13 +344,15 @@ of the repositories listed at
344 + git p4 test: should honor symlink in p4 client root
345 + git p4 test: make sure P4CONFIG relative path works
346
145 - Will cook in 'next'.
347 + Will merge to 'master' in the 3rd batch (Safe).
348
349
350 * jc/add-2.0-delete-default (2013-03-08) 3 commits
149 - - git add <pathspec>... defaults to "-A"
150 - - git add: start preparing for "git add <pathspec>..." to default to "-A"
151 - - builtin/add.c: simplify boolean variables
351 + (merged to 'next' on 2013-03-14 at 4684748)
352 + + git add <pathspec>... defaults to "-A"
353 + (merged to 'next' on 2013-03-14 at 2b7a7a2)
354 + + git add: start preparing for "git add <pathspec>..." to default to "-A"
355 + + builtin/add.c: simplify boolean variables
356
357 "git add dir/" updated modified files and added new files, but does
358 not notice removed files, which may be "Huh?" to some users. They
@@ -158,11 +362,13 @@ of the repositories listed at
362 rebased on top of recent documentation updates to propose a
363 possible transition plan.
364
161 - Will merge to and cook in 'next' until Git 2.0.
365 + Will cook in 'next' until Git 2.0.
366
367
164 -* jc/add-2.0-u-A-sans-pathspec (2013-03-11) 1 commit
165 - - git add: -u/-A now affects the entire working tree
368 +* jc/add-2.0-u-A-sans-pathspec (2013-03-14) 2 commits
369 + (merged to 'next' on 2013-03-14 at 9538716)
370 + + git add: -u/-A now affects the entire working tree
371 + + t2200: check that "add -u" limits itself to subdirectory
372
373 "git add -u/-A" without pathspec has traditonally limited its
374 operation to the current directory and its subdirectories, but in
@@ -171,7 +377,7 @@ of the repositories listed at
377 entire working tree). With this, we finally change the behaviour
378 and make it affect the entire working tree in Git 2.0.
379
174 - Will merge to and cook in 'next' until Git 2.0.
380 + Will cook in 'next' until Git 2.0.
381
382
383 * jk/empty-archive (2013-03-10) 2 commits
@@ -183,7 +389,7 @@ of the repositories listed at
389 of an empty tree. It would be more intuitive to give an empty
390 archive back in such a case.
391
186 - Will cook in 'next'.
392 + Will merge to 'master' in the 3rd batch (Safe).
393
394
395 * jk/graph-c-expose-symbols-for-cgit (2013-03-03) 1 commit
@@ -195,14 +401,14 @@ of the repositories listed at
401 CGit from sideways bypassing the entry points of the API the
402 in-tree users use.
403
198 - Will cook in 'next'.
404 + Will merge to 'master' in the 1st batch (Trivially Safe).
405
406
407 * we/submodule-update-prefix-output (2013-03-03) 1 commit
408 (merged to 'next' on 2013-03-04 at 908df73)
409 + submodule update: when using recursion, show full path
410
205 - Will cook in 'next'.
411 + Will merge to 'master' in the 2nd batch (Safe).
412
413
414 * jc/nobody-sets-src-peer-ref (2013-03-04) 1 commit
@@ -211,7 +417,10 @@ of the repositories listed at
417
418 Dead code removal.
419
214 - Will cook in 'next'.
420 + Even though I think this change is correct, please report
421 + immediately if you find any unintended side effect.
422 +
423 + Will merge to 'master' in the 4th batch (Risky).
424
425
426 * jc/push-follow-tag (2013-03-05) 4 commits
@@ -222,27 +431,16 @@ of the repositories listed at
431 + commit.c: add clear_commit_marks_many()
432
433 The new "--follow-tags" option tells "git push" to push relevant
225 - tags when pushing branches out.
434 + annotated tags when pushing branches out.
435
227 - Will cook in 'next'.
436 + Will merge to 'master' in the 3rd batch (Safe).
437
438
439 * jc/maint-reflog-expire-clean-mark-typofix (2013-03-05) 1 commit
440 (merged to 'next' on 2013-03-07 at 0a61cbb)
441 + reflog: fix typo in "reflog expire" clean-up codepath
442
234 - Will cook in 'next'.
235 -
236 -
237 -* aw/setup-prefix-pathspec (2013-03-09) 2 commits
238 - (merged to 'next' on 2013-03-12 at 31a4a5e)
239 - + setup.c: check that the pathspec magic ends with ")"
240 - + setup.c: stop prefix_pathspec() from looping past the end of string
241 -
242 - "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and
243 - instead the parser kept reading beyond the end of the string.
244 -
245 - Will cook in 'next'.
443 + Will merge to 'master' in the 3rd batch (Safe).
444
445
446 * lf/bundle-verify-list-prereqs (2013-03-08) 2 commits
@@ -250,7 +448,7 @@ of the repositories listed at
448 + bundle: Add colons to list headings in "verify"
449 + bundle: Fix "verify" output if history is complete
450
253 - Will cook in 'next'.
451 + Will merge to 'master' in the 1st batch (Trivially Safe).
452
453
454 * ks/rfc2047-one-char-at-a-time (2013-03-09) 1 commit
@@ -261,7 +459,7 @@ of the repositories listed at
459 it incorrectly applied rfc2047 and chopped a single character in
460 the middle of it.
461
264 - Will cook in 'next'.
462 + Will merge to 'master' in the 3rd batch (Safe).
463
464
465 * kb/name-hash (2013-02-27) 1 commit
@@ -272,17 +470,21 @@ of the repositories listed at
470 platforms with case insensitive filesystems can get confused upon
471 a hash collision between these pathnames and looped forever.
472
275 - Will cook in 'next'.
473 + Even though I think this change is correct, please report
474 + immediately if you find any unintended side effect.
475 +
476 + Will merge to 'master' in the 4th batch (Risky).
477
478
479 * rs/zip-compresssed-size-with-export-subst (2013-02-27) 1 commit
480 (merged to 'next' on 2013-03-03 at c1ac6d8)
481 + archive-zip: fix compressed size for stored export-subst files
482 + (this branch is used by rs/archive-zip-raw-compression.)
483
484 When export-subst is used, "zip" output recorded incorrect
485 size of the file.
486
285 - Will cook in 'next'.
487 + Will merge to 'master' in the 2nd batch (Safe).
488
489
490 * jc/describe (2013-02-28) 1 commit
@@ -297,33 +499,28 @@ of the repositories listed at
499 We may want to have a looser matching that does not restrict to tags,
500 but that can be done as a follow-up topic; this step is purely a bugfix.
501
300 - Will cook in 'next'.
502 + Will merge to 'master' in the 3rd batch (Safe).
503
504
505 * jk/mailsplit-maildir-muttsort (2013-03-02) 1 commit
506 (merged to 'next' on 2013-03-03 at d5f7735)
507 + mailsplit: sort maildir filenames more cleverly
508
307 - Will cook in 'next'.
308 -
309 -
310 -* pc/subtree-add-before-fetch (2013-02-28) 1 commit
311 - - contrib/subtree: allow addition of remote branch with name not locally present
312 -
313 - Will discard.
314 - Not getting enough reviews.
509 + Will merge to 'master' in the 2nd batch (Safe).
510
511
512 * tr/line-log (2013-02-28) 5 commits
318 - - log -L: :pattern:file syntax to find by funcname
319 - - Implement line-history search (git log -L)
320 - - Export rewrite_parents() for 'log -L'
321 - - blame: introduce $ as "end of file" in -L syntax
322 - - Refactor parse_loc
513 + . log -L: :pattern:file syntax to find by funcname
514 + . Implement line-history search (git log -L)
515 + . Export rewrite_parents() for 'log -L'
516 + . blame: introduce $ as "end of file" in -L syntax
517 + . Refactor parse_loc
518
519 Expecting a reroll.
520 $gmane/217278
521
522 + Kept outside 'pu' for now as it collides with nd/magic-pathspecs.
523 +
524
525 * jc/perl-cat-blob (2013-02-22) 1 commit
526 (merged to 'next' on 2013-02-25 at 7c0079a)
@@ -332,7 +529,7 @@ of the repositories listed at
529 perl/Git.pm::cat_blob slurped everything in core only to write it
530 out to a file descriptor, which was not a very smart thing to do.
531
335 - Will cook in 'next'.
532 + Will merge to 'master' in the 2nd batch (Safe).
533
534
535 * nd/doc-index-format (2013-02-23) 3 commits
@@ -343,7 +540,7 @@ of the repositories listed at
540
541 Update the index format documentation to mention the v4 format.
542
346 - Will cook in 'next'.
543 + Will merge to 'master' in the 1st batch (Trivially Safe).
544
545
546 * ap/maint-diff-rename-avoid-overlap (2013-03-06) 3 commits
@@ -358,21 +555,21 @@ of the repositories listed at
555 files before and after a rename did not work correctly when the
556 common prefix and suffix between the two filenames overlapped.
557
361 - Will cook in 'next'.
558 + Will merge to 'master' in the 3rd batch (Safe).
559
560
561 * ap/maint-update-index-h-is-for-help (2013-02-23) 1 commit
562 (merged to 'next' on 2013-02-25 at f5f767c)
563 + update-index: allow "-h" to also display options
564
368 - Will cook in 'next'.
565 + Will merge to 'master' in the 2nd batch (Safe).
566
567
568 * jc/color-diff-doc (2013-02-22) 1 commit
569 (merged to 'next' on 2013-02-25 at c37541c)
570 + diff-options: unconfuse description of --color
571
375 - Will cook in 'next'.
572 + Will merge to 'master' in the 1st batch (Trivially Safe).
573
574
575 * nd/branch-error-cases (2013-02-23) 1 commit
@@ -382,7 +579,7 @@ of the repositories listed at
579 "git branch" had more cases where it did not bother to check
580 nonsense command line parameters.
581
385 - Will cook in 'next'.
582 + Will merge to 'master' in the 2nd batch (Safe).
583
584
585 * rt/commit-cleanup-config (2013-02-23) 1 commit
@@ -393,14 +590,14 @@ of the repositories listed at
590 tests introduced later in the sequence by containing their effects
591 in their own subshells.
592
396 - Will cook in 'next'.
593 + Will merge to 'master' in the 2nd batch (Safe).
594
595
596 * wk/doc-pre-rebase (2013-02-24) 1 commit
597 (merged to 'next' on 2013-02-25 at a6ec310)
598 + Documentation/githooks: Explain pre-rebase parameters
599
403 - Will cook in 'next'.
600 + Will merge to 'master' in the 1st batch (Trivially Safe).
601
602
603 * da/downcase-u-in-usage (2013-02-24) 20 commits
@@ -426,21 +623,21 @@ of the repositories listed at
623 + git-svn: use a lowercase "usage:" string
624 + git-sh-setup: use a lowercase "usage:" string
625
429 - Will cook in 'next'.
626 + Will merge to 'master' in the 1st batch (Trivially Safe).
627
628
629 * dm/ni-maxhost-may-be-missing (2013-02-25) 1 commit
630 (merged to 'next' on 2013-02-26 at 93ec2c9)
631 + git-compat-util.h: Provide missing netdb.h definitions
632
436 - Will cook in 'next'.
633 + Will merge to 'master' in the 1st batch (Trivially Safe).
634
635
636 * gp/avoid-explicit-mention-of-dot-git-refs (2013-02-24) 1 commit
637 (merged to 'next' on 2013-02-26 at ec42d98)
638 + Fix ".git/refs" stragglers
639
443 - Will cook in 'next'.
640 + Will merge to 'master' in the 1st batch (Trivially Safe).
641
642
643 * gp/describe-match-uses-glob-pattern (2013-02-24) 1 commit
@@ -448,7 +645,7 @@ of the repositories listed at
645 + describe: Document --match pattern format
646 (this branch is used by gp/forbid-describe-all-match.)
647
451 - Will cook in 'next'.
648 + Will merge to 'master' in the 1st batch (Trivially Safe).
649
650
651 * jk/common-make-variables-export-safety (2013-02-25) 1 commit
@@ -459,13 +656,17 @@ of the repositories listed at
656 ensuring that they are full paths so that they can be used as
657 installation location.
658
462 - Will cook in 'next'.
659 + Even though I think this change is correct, please report
660 + immediately if you find any unintended side effect.
661 +
662 + Will merge to 'master' in the 4th batch (Risky).
663
664
665 * jk/suppress-clang-warning (2013-02-25) 1 commit
466 - - fix clang -Wtautological-compare with unsigned enum
666 + (merged to 'next' on 2013-03-14 at f30489a)
667 + + fix clang -Wtautological-compare with unsigned enum
668
468 - Will merge to 'next'.
669 + Will merge to 'master' in the 3rd batch (Safe).
670
671
672 * mg/qnx6 (2013-02-25) 1 commit
@@ -476,12 +677,13 @@ of the repositories listed at
677
678
679 * mg/unsigned-time-t (2013-02-25) 2 commits
479 - - Fix time offset calculation in case of unsigned time_t
480 - - date.c: fix unsigned time_t comparison
680 + (merged to 'next' on 2013-03-14 at 815f297)
681 + + Fix time offset calculation in case of unsigned time_t
682 + + date.c: fix unsigned time_t comparison
683
684 A few workarounds for systems with unsigned time_t.
685
484 - Will merge to 'next'.
686 + Will merge to 'master' in the 3rd batch (Safe).
687
688
689 * rj/msvc-build (2013-02-25) 5 commits
@@ -492,21 +694,21 @@ of the repositories listed at
694 + msvc: git-daemon: Fix linker "unresolved external" errors
695 + msvc: Fix compilation errors caused by poll.h emulation
696
495 - Will cook in 'next'.
697 + Will merge to 'master' in the 1st batch (Trivially Safe).
698
699
700 * wk/user-manual-literal-format (2013-02-25) 1 commit
701 (merged to 'next' on 2013-02-26 at d59ce38)
702 + user-manual: Standardize backtick quoting
703
502 - Will cook in 'next'.
704 + Will merge to 'master' in the 1st batch (Trivially Safe).
705
706
707 * jk/utf-8-can-be-spelled-differently (2013-02-25) 1 commit
708 (merged to 'next' on 2013-02-26 at c079525)
709 + utf8: accept alternate spellings of UTF-8
710
509 - Will cook in 'next'.
711 + Will merge to 'master' in the 2nd batch (Safe).
712
713
714 * jk/pkt-line-cleanup (2013-02-24) 19 commits
@@ -531,10 +733,11 @@ of the repositories listed at
733 + upload-pack: do not add duplicate objects to shallow list
734 + upload-pack: use get_sha1_hex to parse "shallow" lines
735
534 - Cleans up pkt-line API, implementation and its callers to make
535 - them more robust.
736 + Cleans up pkt-line API, implementation and its callers to make them
737 + more robust. Even though I think this change is correct, please
738 + report immediately if you find any unintended side effect.
739
537 - Will cook in 'next'.
740 + Will merge to 'master' in the 3rd batch (Risky).
741
742
743 * ob/imap-send-ssl-verify (2013-02-20) 1 commit
@@ -544,7 +747,7 @@ of the repositories listed at
747 Correctly connect to SSL/TLS sites that serve multiple hostnames on
748 a single IP by including Server Name Indication in the client-hello.
749
547 - Will cook in 'next'.
750 + Will merge to 'master' in the 2nd batch (Safe).
751
752
753 * jc/format-patch (2013-02-21) 2 commits
@@ -565,7 +768,7 @@ of the repositories listed at
768 + Documentation: filter-branch env-filter example
769 + git-filter-branch.txt: clarify ident variables usage
770
568 - Will cook in 'next'.
771 + Will merge to 'master' in the 1st batch (Trivially Safe).
772
773
774 * bc/commit-complete-lines-given-via-m-option (2013-02-19) 4 commits
@@ -578,7 +781,7 @@ of the repositories listed at
781 'git commit -m "$str"' when $str was already terminated with a LF
782 now avoids adding an extra LF to the message.
783
581 - Will cook in 'next'.
784 + Will merge to 'master' in the 2nd batch (Safe).
785
786
787 * da/difftool-fixes (2013-02-21) 4 commits
@@ -590,7 +793,7 @@ of the repositories listed at
793
794 Minor maintenance updates to difftool, and updates to its tests.
795
593 - Will cook in 'next'.
796 + Will merge to 'master' in the 2nd batch (Safe).
797
798
799 * nd/read-directory-recursive-optim (2013-02-17) 1 commit
@@ -600,8 +803,10 @@ of the repositories listed at
803 "git status" has been optimized by taking advantage of the fact
804 that paths that are already known to the index do not have to be
805 checked against the .gitignore mechanism under some conditions.
806 + Even though I think this change is correct, please report
807 + immediately if you find any unintended side effect.
808
604 - Will cook in 'next'.
809 + Will merge to 'master' in the 2nd batch (Risky).
810
811
812 * mg/gpg-interface-using-status (2013-02-14) 5 commits
@@ -615,14 +820,15 @@ of the repositories listed at
820 Call "gpg" using the right API when validating the signature on
821 tags.
822
618 - Will cook in 'next'.
823 + Will merge to 'master' in the 2nd batch (Safe).
824
825
826 * jn/shell-disable-interactive (2013-03-09) 2 commits
622 - - shell: new no-interactive-login command to print a custom message
623 - - shell doc: emphasize purpose and security model
827 + (merged to 'next' on 2013-03-14 at 3121f9f)
828 + + shell: new no-interactive-login command to print a custom message
829 + + shell doc: emphasize purpose and security model
830
625 - Will merge to 'next'.
831 + Will merge to 'master' in the 2nd batch (Trivially Safe).
832
833
834 * jc/fetch-raw-sha1 (2013-02-07) 4 commits
@@ -636,7 +842,7 @@ of the repositories listed at
842 hidden ones). It seems that there may be use cases even outside
843 Gerrit (e.g. $gmane/215701).
844
639 - Will cook in 'next'.
845 + Will merge to 'master' in the 2nd batch (Safe).
846
847
848 * mn/send-email-works-with-credential (2013-02-27) 6 commits
@@ -650,7 +856,7 @@ of the repositories listed at
856
857 Hooks the credential system to send-email.
858
653 - Will cook in 'next'.
859 + Will merge to 'master' in the 2nd batch (Safe).
860
861
862 * nd/count-garbage (2013-02-15) 4 commits
@@ -660,7 +866,7 @@ of the repositories listed at
866 + sha1_file: reorder code in prepare_packed_git_one()
867 + git-count-objects.txt: describe each line in -v output
868
663 - Will cook in 'next'.
869 + Will merge to 'master' in the 2nd batch (Safe).
870
871
872 * tz/credential-authinfo (2013-02-25) 1 commit
@@ -671,7 +877,7 @@ of the repositories listed at
877 the .netrc/.authinfo files. Hopefully mn/send-email-authinfo topic
878 can rebuild on top of something like this.
879
674 - Will cook in 'next'.
880 + Will merge to 'master' in the 2nd batch (Safe).
881
882
883 * jl/submodule-deinit (2013-03-04) 1 commit
@@ -682,7 +888,7 @@ of the repositories listed at
888 this submodule", once you express your interest in a submodule with
889 "submodule init". "submodule deinit" is the way to do so.
890
685 - Will cook in 'next'.
891 + Will merge to 'master' in the 3rd batch (Safe).
892
893
894 * jc/remove-export-from-config-mak-in (2013-03-05) 3 commits
@@ -702,7 +908,10 @@ of the repositories listed at
908 broken installation of manpages (but not other documentation
909 formats).
910
705 - Will cook in 'next'.
911 + Even though I think this change is correct, please report
912 + immediately if you find any unintended side effect.
913 +
914 + Will merge to 'master' in the 4th batch (Risky).
915
916
917 * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
@@ -717,7 +926,7 @@ of the repositories listed at
926 infrastructure; even though I think this change is correct, please
927 report immediately if you find any unintended side effect.
928
720 - Will cook in 'next'.
929 + Will merge to 'master' in the 2nd batch (Risky).
930
931
932 * jc/push-2.0-default-to-simple (2013-01-16) 14 commits
@@ -757,19 +966,36 @@ of the repositories listed at
966 + commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
967 + sequencer.c: rework search for start of footer to improve clarity
968
760 - Will cook in 'next'.
969 + Consolidates codepaths that inspect log-message-to-be and decide to
970 + add a new Signed-off-by line in various commands. I think there is
971 + no negative behaviour change in this series, but please report any
972 + iffy behaviour change immediately if you notice one.
973
974 + Will merge to 'master' in the 3rd batch (Risky).
975
763 -* gp/forbid-describe-all-match (2013-02-24) 1 commit
764 - - describe: make --all and --match=PATTERN mutually incompatible
765 - (this branch uses gp/describe-match-uses-glob-pattern.)
976 +--------------------------------------------------
977 +[Discarded]
978 +
979 +* pc/subtree-add-before-fetch (2013-02-28) 1 commit
980 + . contrib/subtree: allow addition of remote branch with name not locally present
981 +
982 + I'll leave subtree updates to the area maintainer.
983
767 - "describe --match=<pattern> --all <commit>" ought to mean "use refs
768 - that match <pattern> to describe <commit>; you do not have to limit
769 - yourself to annotated tags." But it doesn't. Disable the
770 - combination.
984
772 - Will discard.
985 +* gp/forbid-describe-all-match (2013-02-24) 1 commit
986 + . describe: make --all and --match=PATTERN mutually incompatible
987 + (this branch uses gp/describe-match-uses-glob-pattern.)
988
989 jc/describe topic fixes the semantics of --match used with --all
990 option.
991 +
992 +
993 +* aw/setup-prefix-pathspec (2013-03-09) 2 commits
994 + (merged to 'next' on 2013-03-12 at 31a4a5e)
995 + + setup.c: check that the pathspec magic ends with ")"
996 + + setup.c: stop prefix_pathspec() from looping past the end of string
997 +
998 + "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and
999 + instead the parser kept reading beyond the end of the string.
1000 +
1001 + Replaced by lf/setup-prefix-pathspec.