@matheusbsbs / matheus-bagliano / commits / 86dc9c8ee7

What's cooking (2013/08 #06)

Junio C Hamano committed Aug 27, 2013 at 12:20 UTC 86dc9c8ee7da897a83f472ccf6fd7ac0a00e8458
1 file changed +430 -61
whats-cooking.txt
+430 -61
@@ -1,21 +1,23 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Aug 2013, #05; Mon, 19)
4 -X-master-at: 4d06473928ee574910accbde05c19ef2263abdf6
5 -X-next-at: fb33910d190a5cff4020f44651fc3a51f55c0a1f
3 +Subject: What's cooking in git.git (Aug 2013, #06; Tue, 27)
4 +X-master-at: e230c568c4b9a991e3175e5f65171a566fd8e39c
5 +X-next-at: 7bc9019c3113aff1e050cc98e8c378a6e66abe81
6
7 -What's cooking in git.git (Aug 2013, #05; Mon, 19)
7 +What's cooking in git.git (Aug 2013, #06; Tue, 27)
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 -An extra release candidate -rc4 has been tagged and pushed out.
15 -Hopefully this will be the last one before the final release of
16 -1.8.4. As I expect we will have two more cycles of 1.8.x by the end
17 -of the year and then 2.0 early next year, we may want to merge these
18 -"for 2.0" topics to 'next' for real, starting the next cycle.
14 +Git 1.8.4 was tagged and released recently, and we will shortly go
15 +into a new development cycle for the next one, likely to be 1.8.5.
16 +
17 +I expect this cycle to conclude at around the end of October, and we
18 +will have another release by the end of the year. The first release
19 +in the coming year may be named "Git 2.0" with the promised
20 +compatibility breakages.
21
22 You can find the changes described here in the integration branches
23 of the repositories listed at
@@ -25,55 +27,252 @@ of the repositories listed at
27 --------------------------------------------------
28 [New Topics]
29
28 -* es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit
29 - - rebase -i: fix cases ignoring core.commentchar
30 +* js/xread-in-full (2013-08-20) 1 commit
31 + (merged to 'next' on 2013-08-20 at 95baa13)
32 + + stream_to_pack: xread does not guarantee to read all requested bytes
33
31 - Will merge to and cook in 'next'.
34 + Originally merged to 'next' on 2013-08-20
35
36 + A call to xread() was used without a loop around to cope with short
37 + read in the codepath to stream new contents to a pack.
38
34 -* jx/branch-vv-always-compare-with-upstream (2013-08-18) 3 commits
35 - - status: always show tracking branch even no change
36 - - branch: mark missing tracking branch as gone
37 - - branch: not report invalid tracking branch
39 + Will cook in 'next'.
40
41
40 -* nd/fetch-into-shallow (2013-08-18) 6 commits
41 - - list-objects: mark more commits as edges in mark_edges_uninteresting
42 - - list-objects: reduce one argument in mark_edges_uninteresting
43 - - upload-pack: delegate rev walking in shallow fetch to pack-objects
44 - - shallow: add setup_temporary_shallow()
45 - - shallow: only add shallow graft points to new shallow file
46 - - move setup_alternate_shallow and write_shallow_commits to shallow.c
42 +* sb/mailmap-freeing-NULL-is-ok (2013-08-20) 1 commit
43 + (merged to 'next' on 2013-08-20 at 303b16c)
44 + + mailmap: remove redundant check for freeing memory
45
46 + Originally merged to 'next' on 2013-08-20
47
49 -* sb/diff-delta-remove-needless-comparison (2013-08-18) 1 commit
50 - - create_delta_index: simplify condition always evaluating to true
48 + Will cook in 'next'.
49
52 - Will merge to and cook in 'next'.
50
51 +* tg/index-struct-sizes (2013-08-20) 1 commit
52 + (merged to 'next' on 2013-08-22 at df6b8e2)
53 + + read-cache: use fixed width integer types
54
55 -* sg/bash-prompt-lf-in-cwd-test (2013-08-18) 1 commit
56 - - bash prompt: test the prompt with newline in repository path
55 + Originally merged to 'next' on 2013-08-22
56
58 - Will merge to and cook in 'next'.
57 + The code that reads from a region that mmaps an on-disk index
58 + assumed that "int"/"short" are always 32/16 bits.
59
60 + Will cook in 'next'.
61
61 -* jl/some-submodule-config-are-not-boolean (2013-08-19) 1 commit
62 - - avoid segfault on submodule.*.path set to an empty "true"
62
64 - Will merge to and cook in 'next'.
63 +* bc/completion-for-bash-3.0 (2013-08-22) 3 commits
64 + (merged to 'next' on 2013-08-22 at 46c5bb2)
65 + + contrib/git-prompt.sh: handle missing 'printf -v' more gracefully
66 + + t9902-completion.sh: old Bash still does not support array+=('') notation
67 + + git-completion.bash: use correct Bash/Zsh array length syntax
68
66 ---------------------------------------------------
67 -[Stalled]
69 + Originally merged to 'next' on 2013-08-22
70 +
71 + Some people still use rather old versions of bash, which cannot
72 + grok some constructs like 'printf -v varname' the prompt and
73 + completion code started to use recently.
74 +
75 + Will cook in 'next'.
76 +
77 +
78 +* bc/submodule-status-ignored (2013-08-20) 2 commits
79 + (merged to 'next' on 2013-08-22 at 3dfd2a3)
80 + + submodule: don't print status output with ignore=all
81 + + submodule: fix confusing variable name
82 +
83 + Originally merged to 'next' on 2013-08-22
84 +
85 + Will cook in 'next'.
86 +
87 +
88 +* jk/config-int-range-check (2013-08-21) 2 commits
89 + (merged to 'next' on 2013-08-22 at 465efb3)
90 + + teach git-config to output large integers
91 + + config: properly range-check integer values
92 +
93 + Originally merged to 'next' on 2013-08-22
94 +
95 + "git config --int section.var 3g" should somehow diagnose that the
96 + number does not fit in "int" (on 32-bit platforms anyway) but it
97 + did not.
98 +
99 + Will cook in 'next'.
100 +
101 +
102 +* jk/duplicate-objects-in-packs (2013-08-24) 6 commits
103 + - default pack.indexDuplicates to false
104 + - index-pack: optionally reject packs with duplicate objects
105 + - test index-pack on packs with recoverable delta cycles
106 + - add tests for indexing packs with delta cycles
107 + - sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
108 + - test-sha1: add a binary output mode
109 +
110 + A packfile that stores the same object more than once is broken and
111 + will be rejected.
112 +
113 + Will merge to 'next'.
114 +
115 +
116 +* mm/mediawiki-dumb-push-fix (2013-08-21) 2 commits
117 + - git-remote-mediawiki: add test and check Makefile targets
118 + - git-remote-mediawiki: reset private ref after non-dumb push
119 +
120 + Waiting for a reroll.
121 +
122 +
123 +* rt/rebase-p-no-merge-summary (2013-08-21) 1 commit
124 + (merged to 'next' on 2013-08-22 at 5310599)
125 + + rebase --preserve-merges: ignore "merge.log" config
126 +
127 + Originally merged to 'next' on 2013-08-22
128 +
129 + "git rebase -p" internally used the merge machinery, but when
130 + rebasing, there should not be a need for merge summary.
131 +
132 + Will cook in 'next'.
133 +
134 +
135 +* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
136 + - git-send-email: Cache generated message-ids, use them when prompting
137 + - git-send-email: add optional 'choices' parameter to the ask sub
138 +
139 +
140 +* sp/clip-read-write-to-8mb (2013-08-20) 2 commits
141 + (merged to 'next' on 2013-08-22 at 254e75d)
142 + + Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"
143 + + xread, xwrite: limit size of IO to 8MB
144 +
145 + Originally merged to 'next' on 2013-08-22
146 +
147 + Send a large request to read(2)/write(2) as a smaller but still
148 + reasonably large chunks, which would improve the latency when the
149 + operation needs to be killed and incidentally works around broken
150 + 64-bit systems that cannot take a 2GB write or read in one go.
151 +
152 + Will cook in 'next'.
153 +
154 +
155 +* sp/doc-smart-http (2013-08-21) 1 commit
156 + (merged to 'next' on 2013-08-22 at 4a16937)
157 + + Document the HTTP transport protocols
158 +
159 + Originally merged to 'next' on 2013-08-22
160 +
161 + Will cook in 'next'.
162 +
163 +
164 +* dw/diff-no-index-doc (2013-08-22) 1 commit
165 + - diff --no-index: clarify operation when not inside a repository
166 +
167 + When the user types "git diff" outside a working tree, thinking he
168 + is inside one, the current error message that is a single-liner
169 + "usage: git diff --no-index <path> <path>" may not be sufficient to
170 + make him realize the mistake. Add "Not a git repository" to the
171 + error message when we fell into the "--no-index" mode without an
172 + explicit command line option to instruct us to do so.
173 +
174 +
175 +* sb/repack-in-c (2013-08-22) 3 commits
176 + - repack: rewrite the shell script in C (squashing proposal)
177 + - repack: retain the return value of pack-objects
178 + - repack: rewrite the shell script in C
179 +
180 +
181 +* ap/commit-author-mailmap (2013-08-24) 1 commit
182 + - commit: search author pattern against mailmap
183 +
184 + "git commit --author=$name", when $name is not in the canonical
185 + "A. U. Thor <au.thor@example.xz>" format, looks for a matching name
186 + from existing history, but did not consult mailmap to grab the
187 + preferred author name.
188 +
189 + Will merge to 'next'.
190 +
191 +
192 +* hv/config-from-blob (2013-08-26) 1 commit
193 + (merged to 'next' on 2013-08-27 at 7bc9019)
194 + + config: do not use C function names as struct members
195 +
196 + Originally merged to 'next' on 2013-08-27
197 +
198 + Portability fix.
199 +
200 + Will merge to 'master', aiming to later apply to 1.8.4.x maintenance track.
201 +
202 +
203 +* jk/mailmap-incomplete-line (2013-08-25) 2 commits
204 + - mailmap: avoid allocation when reading from blob
205 + - mailmap: handle mailmap blobs without trailing newlines
206 +
207 + Will merge to 'next'.
208 +
209 +
210 +* jk/write-broken-index-with-nul-sha1 (2013-08-26) 1 commit
211 + - write_index: optionally allow broken null sha1s
212 +
213 + Am I waiting for another reroll?
214 +
215 +
216 +* kk/tests-with-no-perl (2013-08-24) 4 commits
217 + - reset test: modernize style
218 + - t/t7106-reset-unborn-branch.sh: Add PERL prerequisite
219 + - add -i test: use skip_all instead of repeated PERL prerequisite
220 + - Make test "using invalid commit with -C" more strict
221 +
222 + Am I waiting for another reroll?
223 +
224 +
225 +* mm/fast-import-feature-doc (2013-08-25) 1 commit
226 + - Documentation/fast-import: clarify summary for `feature` command
227 +
228 + Will merge to 'next'.
229 +
230 +
231 +* mm/remote-helpers-doc (2013-08-26) 1 commit
232 + - Documentation/remote-helpers: document common use-case for private ref
233 +
234 + Will merge to 'next'.
235 +
236 +
237 +* mn/doc-pack-heu-remove-dead-pastebin (2013-08-23) 1 commit
238 + - remove dead pastebin link from pack-heuristics document
239 +
240 + Will merge to 'next'.
241 +
242 +
243 +* nd/fetch-pack-shallow-fix (2013-08-25) 1 commit
244 + (merged to 'next' on 2013-08-27 at 7c2a162)
245 + + fetch-pack: do not remove .git/shallow file when --depth is not specified
246 +
247 + Originally merged to 'next' on 2013-08-27
248 +
249 + Recent "short-cut clone connectivity check" topic broke a shallow
250 + repository when a fetch operation tries to auto-follow tags.
251 +
252 + Will merge to 'master', aiming to later apply to 1.8.4.x maintenance track.
253 +
254 +
255 +* ta/user-manual (2013-08-24) 6 commits
256 + - Remove irrelevant reference from "Tying it all together"
257 + - Remove unnecessary historical note from "Object storage format"
258 + - Simplify "How to make a commit"
259 + - Use "git merge" instead of "git pull ."
260 + - Use current output for "git repack"
261 + - Call it "Git User Manual" and remove reference to very old Git version
262 +
263 + Update the user's manual to more recent versions of Git.
264
69 -* tf/gitweb-ss-tweak (2013-07-15) 4 commits
70 - - gitweb: make search help link less ugly
71 - - gitweb: omit the repository owner when it is unset
72 - - gitweb: vertically centre contents of page footer
73 - - gitweb: ensure OPML text fits inside its box
265 + I've picked up only the least questionable bits from a slightly
266 + larger series.
267
75 - Comments?
268
269 +* tb/precompose-autodetect-fix (2013-08-27) 1 commit
270 + - Set core.precomposeunicode to true on e.g. HFS+
271 +
272 + Will merge to 'next'.
273 +
274 +--------------------------------------------------
275 +[Stalled]
276
277 * rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
278 - ### DONTMERGE: needs better explanation on what config they need
@@ -171,17 +370,99 @@ of the repositories listed at
370 --------------------------------------------------
371 [Cooking]
372
174 -* jc/ls-files-killed-optim (2013-08-15) 3 commits
175 - - t3010: update to demonstrate "ls-files -k" optimization pitfalls
176 - - ls-files -k: a directory only can be killed if the index has a non-directory
177 - - dir.c: use the cache_* macro to access the current index
373 +* tf/gitweb-ss-tweak (2013-08-20) 4 commits
374 + (merged to 'next' on 2013-08-22 at 3978368)
375 + + gitweb: make search help link less ugly
376 + + gitweb: omit the repository owner when it is unset
377 + + gitweb: vertically centre contents of page footer
378 + + gitweb: ensure OPML text fits inside its box
379 +
380 + Originally merged to 'next' on 2013-08-22
381 +
382 + Tweak Gitweb CSS to layout some elements better.
383 +
384 + Will cook in 'next'.
385 +
386 +
387 +* es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit
388 + (merged to 'next' on 2013-08-20 at 9f3d0c8)
389 + + rebase -i: fix cases ignoring core.commentchar
390 +
391 + Originally merged to 'next' on 2013-08-20
392 +
393 + Will cook in 'next'.
394 +
395 +
396 +* jx/branch-vv-always-compare-with-upstream (2013-08-26) 2 commits
397 + - status: always show tracking branch even no change
398 + - branch: report invalid tracking branch as gone
399 +
400 + "git branch -v -v" (and "git status") did not distinguish among a
401 + branch that does not build on any other branch, a branch that is in
402 + sync with the branch it builds on, and a branch that is configured
403 + to build on some other branch that no longer exists.
404 +
405 + Am I waiting for another reroll?
406 +
407 +
408 +* nd/fetch-into-shallow (2013-08-18) 6 commits
409 + - list-objects: mark more commits as edges in mark_edges_uninteresting
410 + - list-objects: reduce one argument in mark_edges_uninteresting
411 + - upload-pack: delegate rev walking in shallow fetch to pack-objects
412 + - shallow: add setup_temporary_shallow()
413 + - shallow: only add shallow graft points to new shallow file
414 + - move setup_alternate_shallow and write_shallow_commits to shallow.c
415 +
416 + When there is no sufficient overlap between old and new history
417 + during a fetch into a shallow repository, we unnecessarily sent
418 + objects the sending side knows the receiving end has.
419 +
420 + Will merge to 'next'.
421 +
422 +
423 +* sb/diff-delta-remove-needless-comparison (2013-08-18) 1 commit
424 + (merged to 'next' on 2013-08-20 at c35730b)
425 + + create_delta_index: simplify condition always evaluating to true
426 +
427 + Originally merged to 'next' on 2013-08-20
428 +
429 + Will cook in 'next'.
430 +
431 +
432 +* sg/bash-prompt-lf-in-cwd-test (2013-08-18) 1 commit
433 + (merged to 'next' on 2013-08-20 at 5544f62)
434 + + bash prompt: test the prompt with newline in repository path
435 +
436 + Originally merged to 'next' on 2013-08-20
437 +
438 + Will cook in 'next'.
439 +
440 +
441 +* jl/some-submodule-config-are-not-boolean (2013-08-19) 1 commit
442 + (merged to 'next' on 2013-08-20 at 140c2e4)
443 + + avoid segfault on submodule.*.path set to an empty "true"
444 +
445 + Originally merged to 'next' on 2013-08-20
446 +
447 + Will cook in 'next'.
448 +
449 +
450 +* jc/ls-files-killed-optim (2013-08-23) 4 commits
451 + (merged to 'next' on 2013-08-27 at f7687d1)
452 + + dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
453 + (merged to 'next' on 2013-08-20 at d4bf1ad)
454 + + t3010: update to demonstrate "ls-files -k" optimization pitfalls
455 + + ls-files -k: a directory only can be killed if the index has a non-directory
456 + + dir.c: use the cache_* macro to access the current index
457 +
458 + Originally merged to 'next' on 2013-08-27
459
460 "git ls-files -k" needs to crawl only the part of the working tree
461 that may overlap the paths in the index to find killed files, but
462 shared code with the logic to find all the untracked files, which
463 made it unnecessarily inefficient.
464
184 - Will merge to and cook in 'next'.
465 + Will cook in 'next'.
466
467
468 * es/blame-L-twice (2013-08-06) 16 commits
@@ -204,6 +485,8 @@ of the repositories listed at
485 + git-log.txt: place each -L option variation on its own line
486 (this branch is used by es/contacts-blame-L-multi; uses es/blame-L-more.)
487
488 + Originally merged to 'next' on 2013-08-08
489 +
490 Teaches "git blame" to take more than one -L ranges.
491
492 Will cook in 'next'.
@@ -213,6 +496,8 @@ of the repositories listed at
496 (merged to 'next' on 2013-08-08 at bddff86)
497 + die_with_status: use "printf '%s\n'", not "echo"
498
499 + Originally merged to 'next' on 2013-08-08
500 +
501 Fixes a minor bug in "git rebase -i" (there could be others, as the
502 root cause is pretty generic) where the code feeds a random, data
503 dependeant string to 'echo' and expects it to come out literally.
@@ -224,6 +509,8 @@ of the repositories listed at
509 (merged to 'next' on 2013-08-08 at f452c5b)
510 + t0070: test that git_mkstemps correctly checks return value of open()
511
512 + Originally merged to 'next' on 2013-08-08
513 +
514 Finishing touches to an earlier fix already in 'master'.
515
516 Will cook in 'next'.
@@ -233,15 +520,18 @@ of the repositories listed at
520 (merged to 'next' on 2013-08-14 at cd963e3)
521 + remote-hg: fix path when cloning with tilde expansion
522
523 + Originally merged to 'next' on 2013-08-14
524 +
525 Will cook in 'next'.
526
527
239 -* es/rebase-i-no-abbrev (2013-08-18) 4 commits
240 - - rebase -i: fix core.commentchar regression
241 - (merged to 'next' on 2013-08-14 at d449e0e)
242 - + rebase: interactive: fix short SHA-1 collision
243 - + t3404: rebase: interactive: demonstrate short SHA-1 collision
244 - + t3404: restore specialized rebase-editor following commentchar test
528 +* es/rebase-i-no-abbrev (2013-08-25) 3 commits
529 + (merged to 'next' on 2013-08-26 at 1c3d45d)
530 + + rebase -i: fix short SHA-1 collision
531 + + t3404: rebase -i: demonstrate short SHA-1 collision
532 + + t3404: make tests more self-contained
533 +
534 + Originally merged to 'next' on 2013-08-26
535
536 Will cook in 'next'.
537
@@ -251,15 +541,20 @@ of the repositories listed at
541 + remote-hg: add shared repo upgrade
542 + remote-hg: ensure shared repo is initialized
543
544 + Originally merged to 'next' on 2013-08-14
545 +
546 Will cook in 'next'.
547
548
549 * jc/transport-do-not-use-connect-twice-in-fetch (2013-08-07) 5 commits
258 - - fetch: work around "transport-take-over" hack
259 - - fetch: refactor code that fetches leftover tags
260 - - fetch: refactor code that prepares a transport
261 - - fetch: rename file-scope global "transport" to "gtransport"
262 - - t5802: add test for connect helper
550 + (merged to 'next' on 2013-08-20 at 5414722)
551 + + fetch: work around "transport-take-over" hack
552 + + fetch: refactor code that fetches leftover tags
553 + + fetch: refactor code that prepares a transport
554 + + fetch: rename file-scope global "transport" to "gtransport"
555 + + t5802: add test for connect helper
556 +
557 + Originally merged to 'next' on 2013-08-20
558
559 The auto-tag-following code in "git fetch" tries to reuse the same
560 transport twice when the serving end does not cooperate and does
@@ -268,8 +563,7 @@ of the repositories listed at
563 interface is not designed to be used more than once, hence this
564 does not work over smart-http transfer.
565
271 - I'll try to see if this workaround can be done in a cleaner way
272 - before merging this to 'next'.
566 + Will cook in 'next'.
567
568
569 * ks/p4-view-spec (2013-08-11) 3 commits
@@ -285,6 +579,8 @@ of the repositories listed at
579 + whatchanged: document its historical nature
580 + core-tutorial: trim the section on Inspecting Changes
581
582 + Originally merged to 'next' on 2013-08-14
583 +
584 Will cook in 'next'.
585
586
@@ -292,6 +588,8 @@ of the repositories listed at
588 (merged to 'next' on 2013-08-14 at 6999651)
589 + gc: reject if another gc is running, unless --force is given
590
591 + Originally merged to 'next' on 2013-08-14
592 +
593 Will cook in 'next'.
594
595
@@ -299,6 +597,8 @@ of the repositories listed at
597 (merged to 'next' on 2013-08-14 at 1e5847b)
598 + Documentation/git-merge-file: document option "--diff3"
599
600 + Originally merged to 'next' on 2013-08-14
601 +
602 Will cook in 'next'.
603
604
@@ -308,6 +608,8 @@ of the repositories listed at
608 + diff: fix a possible null pointer dereference
609 + diff: remove ternary operator evaluating always to true
610
611 + Originally merged to 'next' on 2013-08-14
612 +
613 Will cook in 'next'.
614
615
@@ -315,6 +617,8 @@ of the repositories listed at
617 (merged to 'next' on 2013-08-14 at a4959b7)
618 + git-p4: Fix occasional truncation of symlink contents.
619
620 + Originally merged to 'next' on 2013-08-14
621 +
622 Will cook in 'next'.
623
624
@@ -325,6 +629,8 @@ of the repositories listed at
629 + contacts: validate hunk length earlier
630 (this branch uses es/blame-L-more and es/blame-L-twice.)
631
632 + Originally merged to 'next' on 2013-08-14
633 +
634 Will cook in 'next'.
635
636
@@ -332,6 +638,8 @@ of the repositories listed at
638 (merged to 'next' on 2013-08-14 at 989f329)
639 + unpack-trees: plug a memory leak
640
641 + Originally merged to 'next' on 2013-08-14
642 +
643 Will cook in 'next'.
644
645
@@ -339,6 +647,8 @@ of the repositories listed at
647 (merged to 'next' on 2013-08-14 at b2d0fa9)
648 + push: respect --no-thin
649
650 + Originally merged to 'next' on 2013-08-14
651 +
652 Will cook in 'next'.
653
654
@@ -346,6 +656,8 @@ of the repositories listed at
656 (merged to 'next' on 2013-08-14 at 99a85dd)
657 + pull: Allow pull to preserve merges when rebasing.
658
659 + Originally merged to 'next' on 2013-08-14
660 +
661 Will cook in 'next'.
662
663
@@ -364,6 +676,8 @@ of the repositories listed at
676 + t8001/t8002: blame: decompose overly-large test
677 (this branch is used by es/blame-L-twice and es/contacts-blame-L-multi.)
678
679 + Originally merged to 'next' on 2013-08-06
680 +
681 More fixes to the code to parse the "-L" option in "log" and "blame".
682
683 Will cook in 'next'.
@@ -373,15 +687,20 @@ of the repositories listed at
687 (merged to 'next' on 2013-08-06 at cd48621)
688 + cat-file: only split on whitespace when %(rest) is used
689
690 + Originally merged to 'next' on 2013-08-06
691 +
692 Rework the reverted change to `cat-file --batch-check`.
693
694 Will cook in 'next'.
695
696
697 * jn/post-receive-utf8 (2013-08-05) 3 commits
382 - - hooks/post-receive-email: set declared encoding to utf-8
383 - - hooks/post-receive-email: force log messages in UTF-8
384 - - hooks/post-receive-email: use plumbing instead of git log/show
698 + (merged to 'next' on 2013-08-20 at 1623e8f)
699 + + hooks/post-receive-email: set declared encoding to utf-8
700 + + hooks/post-receive-email: force log messages in UTF-8
701 + + hooks/post-receive-email: use plumbing instead of git log/show
702 +
703 + Originally merged to 'next' on 2013-08-20
704
705 Update post-receive-email script to make sure the message contents
706 and pathnames are encoded consistently in UTF-8.
@@ -394,6 +713,8 @@ of the repositories listed at
713 log message could be transferred with core.quotepath set and patch
714 generated as all binary, but that would be pretty much useless.
715
716 + Will cook in 'next'.
717 +
718
719 * sb/parseopt-boolean-removal (2013-08-07) 9 commits
720 (merged to 'next' on 2013-08-08 at b138a2d)
@@ -408,6 +729,8 @@ of the repositories listed at
729 + Remove deprecated OPTION_BOOLEAN for parsing arguments
730 (this branch uses jc/parseopt-command-modes.)
731
732 + Originally merged to 'next' on 2013-08-08
733 +
734 Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
735 OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
736 remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary.
@@ -419,6 +742,8 @@ of the repositories listed at
742 (merged to 'next' on 2013-08-06 at 763d868)
743 + Provide some linguistic guidance for the documentation.
744
745 + Originally merged to 'next' on 2013-08-06
746 +
747 Declare that the official grammar & spelling of the source of this
748 project is en_US, but strongly discourage patches only to "fix"
749 existing en_UK strings to avoid unnecessary churns.
@@ -432,6 +757,8 @@ of the repositories listed at
757 + parse-options: add OPT_CMDMODE()
758 (this branch is used by sb/parseopt-boolean-removal.)
759
760 + Originally merged to 'next' on 2013-08-08
761 +
762 Many commands use --dashed-option as a operation mode selector
763 (e.g. "git tag --delete") that the user can use at most one
764 (e.g. "git tag --delete --verify" is a nonsense) and you cannot
@@ -446,6 +773,8 @@ of the repositories listed at
773 + log: use true parents for diff when walking reflogs
774 + log: use true parents for diff even when rewriting
775
776 + Originally merged to 'next' on 2013-08-08
777 +
778 Output from "git log --full-diff -- <pathspec>" looked strange,
779 because comparison was done with the previous ancestor that touched
780 the specified <pathspec>, causing the patches for paths outside the
@@ -461,6 +790,8 @@ of the repositories listed at
790 + Don't close pack fd when free'ing pack windows
791 + sha1_file: introduce close_one_pack() to close packs on fd pressure
792
793 + Originally merged to 'next' on 2013-08-06
794 +
795 Handle memory pressure and file descriptor pressure separately when
796 deciding to release pack windows to honor resource limits.
797
@@ -474,6 +805,8 @@ of the repositories listed at
805 (merged to 'next' on 2013-08-01 at d151a94)
806 + imap-send: use Apple's Security framework for base64 encoding
807
808 + Originally merged to 'next' on 2013-08-05
809 +
810 Will cook in 'next'.
811
812
@@ -483,6 +816,8 @@ of the repositories listed at
816 + tar-tree: remove dependency on sq_quote_print()
817 + for-each-ref, quote: convert *_quote_print -> *_quote_buf
818
819 + Originally merged to 'next' on 2013-08-01
820 +
821 Code simplification as a preparatory step to something larger.
822
823 Will cook in 'next'.
@@ -499,6 +834,8 @@ of the repositories listed at
834 + config: add helper to normalize and match URLs
835 + http.c: fix parsing of http.sslCertPasswordProtected variable
836
837 + Originally merged to 'next' on 2013-08-12
838 +
839 Allow section.<urlpattern>.var configuration variables to be
840 treated as a "virtual" section.var given a URL, and use the
841 mechanism to enhance http.* configuration variables.
@@ -517,6 +854,8 @@ of the repositories listed at
854 + mv: move submodules together with their work trees
855 (this branch uses nd/magic-pathspec.)
856
857 + Originally merged to 'next' on 2013-08-08
858 +
859 "git mv A B" when moving a submodule A does "the right thing",
860 inclusing relocating its working tree and adjusting the paths in
861 the .gitmodules file.
@@ -528,6 +867,8 @@ of the repositories listed at
867 (merged to 'next' on 2013-07-30 at 8d16721)
868 + smart http: use the same connectivity check on cloning
869
870 + Originally merged to 'next' on 2013-07-30
871 +
872 Will cook in 'next'.
873
874
@@ -537,6 +878,8 @@ of the repositories listed at
878 (merged to 'next' on 2013-07-30 at d2ad6e5)
879 + http: add http.savecookies option to write out HTTP cookies
880
881 + Originally merged to 'next' on 2013-08-05
882 +
883 Will cook in 'next'.
884
885
@@ -544,6 +887,8 @@ of the repositories listed at
887 (merged to 'next' on 2013-07-30 at 8a9964c)
888 + fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL
889
890 + Originally merged to 'next' on 2013-07-30
891 +
892 Will drop.
893
894 sb/parseopt-boolean-removal contains the moral equivalent of this
@@ -554,6 +899,8 @@ of the repositories listed at
899 (merged to 'next' on 2013-07-30 at 72c9bcb)
900 + editor: use canonicalized absolute path
901
902 + Originally merged to 'next' on 2013-07-30
903 +
904 Will cook in 'next'.
905
906
@@ -562,6 +909,8 @@ of the repositories listed at
909 + rev-parse(1): logically group options
910 + rev-parse: remove restrictions on some options
911
912 + Originally merged to 'next' on 2013-07-22
913 +
914 Will cook in 'next'.
915
916
@@ -572,6 +921,8 @@ of the repositories listed at
921 + fast-import: set valid mode on root tree in "ls"
922 + t9300: document fast-import empty path issues
923
924 + Originally merged to 'next' on 2013-07-22
925 +
926 Will cook in 'next'.
927
928
@@ -585,6 +936,8 @@ of the repositories listed at
936 + diff: pass the whole diff_options to diffcore_apply_filter()
937 (this branch is used by jc/hold-diff-remove-q-synonym-for-no-deletion.)
938
939 + Originally merged to 'next' on 2013-07-22
940 +
941 Teach "git diff --diff-filter" to express "I do not want to see
942 these classes of changes" more directly by listing only the
943 unwanted ones in lowercase (e.g. "--diff-filter=d" will show
@@ -647,6 +1000,8 @@ of the repositories listed at
1000 + clean: remove unused variable "seen"
1001 (this branch is used by jl/submodule-mv.)
1002
1003 + Originally merged to 'next' on 2013-07-23
1004 +
1005 Use "struct pathspec" interface in more places, instead of array of
1006 characters, the latter of which cannot express magic pathspecs
1007 (e.g. ":(icase)makefile" that matches both Makefile and makefile).
@@ -661,6 +1016,8 @@ of the repositories listed at
1016 + check-attr: the name of the character is NUL, not NULL
1017 + check-ignore: the name of the character is NUL, not NULL
1018
1019 + Originally merged to 'next' on 2013-07-15
1020 +
1021 "git check-ignore -z" applied the NUL termination to both its input
1022 (with --stdin) and its output, but "git check-attr -z" ignored the
1023 option on the output side.
@@ -677,6 +1034,8 @@ of the repositories listed at
1034 (merged to 'next' on 2013-07-21 at 7ffb690)
1035 + fetch: make --prune configurable
1036
1037 + Originally merged to 'next' on 2013-07-21
1038 +
1039 Allow fetch.prune and remote.*.prune configuration variables to be set,
1040 and "git fetch" to behave as if "--prune" is given.
1041
@@ -695,6 +1054,8 @@ of the repositories listed at
1054 + git-svn: allow git-svn fetching to work using serf
1055 + Git.pm: add new temp_is_locked function
1056
1057 + Originally merged to 'next' on 2013-07-19
1058 +
1059 Subversion 1.8.0 that was recently released breaks older subversion
1060 clients coming over http/https in various ways.
1061
@@ -723,6 +1084,8 @@ of the repositories listed at
1084 + builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN
1085 + cache.h: move remote/connect API out of it
1086
1087 + Originally merged to 'next' on 2013-08-05
1088 +
1089 Allow a safer "rewind of the remote tip" push than blind "--force",
1090 by requiring that the overwritten remote ref to be unchanged since
1091 the new history to replace it was prepared.
@@ -744,6 +1107,8 @@ of the repositories listed at
1107 (merged to 'next' on 2013-07-22 at 748180e)
1108 + pull: require choice between rebase/merge on non-fast-forward pull
1109
1110 + Originally merged to 'next' on 2013-07-22
1111 +
1112 Make "git pull" (without arguments that say what branch to
1113 integrate from where) refuse with "it does not fast forward; choose
1114 between 'pull --merge' and 'pull --rebase'".
@@ -809,6 +1174,8 @@ of the repositories listed at
1174 (merged to 'next' on 2013-07-24 at 9c96641)
1175 + remotes-hg: bugfix for fetching non local remotes
1176
1177 + Originally merged to 'next' on 2013-07-25
1178 +
1179 Reverted.
1180
1181 Waiting for the final patch to replace, after discussion settles.
@@ -826,4 +1193,6 @@ of the repositories listed at
1193 + config: add support for http.<url>.* settings
1194 + http.c: fix parsing of http.sslCertPasswordProtected variable
1195
1196 + Originally merged to 'next' on 2013-07-31
1197 +
1198 Reverted to be replaced with a reroll (jc/url-match topic).