What's cooking (2011/06 #05)
Junio C Hamano committed
Jun 30, 2011 at 16:24 UTC
a0e604412082778e53f9893034335ecd9156189c
1 file changed
+222
-150
whats-cooking.txt
+222
-150
@@ -1,24 +1,165 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2011, #04; Wed, 22)
3
-X-master-at: 7af4fc9cf3e3538a9bfb8b14feeacdeb7f6db7d5
4
-X-next-at: cb7154dc1f1bd87d1e3d1944b736c15bdbae1d91
2
+Subject: What's cooking in git.git (Jun 2011, #05; Thu, 30)
3
+X-master-at: 033c2dc4364042b9e6dbd44e82e1974f78a72567
4
+X-next-at: 9901923cf0994582592a34128a466c58735621fd
5
6
-What's cooking in git.git (Jun 2011, #04; Wed, 22)
6
+What's cooking in git.git (Jun 2011, #05; Thu, 30)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-I ended up tagging 1.7.6-rc3; please test it well. The final expected to
13
-be at around the end of the week.
12
+Now that 1.7.6 is out, 'next' has been rewound and rebuilt to make its
13
+history appear a bit cleaner.
14
+
15
+Also I updated the order of topics in 'pu' to have the ones that are
16
+scheduled for 'next' early in the sequence (and fixes and documentation
17
+updates come earlier than new features), and pushing the stalled ones down
18
+to the very end.
19
+
20
+The tip of 'pu' is broken with respect to t7610 as of today.
21
22
--------------------------------------------------
23
[New Topics]
24
18
-* ak/gcc46-profile-feedback (2011-06-20) 3 commits
19
- - Add explanation of the profile feedback build to the README
20
- - Add profile feedback build to git
21
- - Add option to disable NORETURN
25
+* bc/submodule-foreach-stdin-fix-1.7.4 (2011-06-29) 2 commits
26
+ - git-submodule.sh: preserve stdin for the command spawned by foreach
27
+ - t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin
28
+
29
+Will merge to 'next'.
30
+
31
+* dc/stash-con-untracked (2011-06-26) 1 commit
32
+ - stash: Add --include-untracked option to stash and remove all untracked files
33
+
34
+* jn/doc-dashdash (2011-06-29) 2 commits
35
+ - Documentation/i18n: quote double-dash for AsciiDoc
36
+ - Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
37
+ (this branch uses jn/maint-doc-dashdash.)
38
+
39
+Will merge to 'next'.
40
+
41
+* jn/maint-doc-dashdash (2011-06-29) 1 commit
42
+ - Documentation: quote double-dash for AsciiDoc
43
+ (this branch is used by jn/doc-dashdash.)
44
+
45
+Will merge to 'next'.
46
+
47
+* js/rebase-typo-branch-squelch-usage (2011-06-29) 1 commit
48
+ - rebase: do not print lots of usage hints after an obvious error message
49
+
50
+Will merge to 'next'.
51
+
52
+* nk/ref-doc (2011-06-23) 7 commits
53
+ - glossary: clarify description of HEAD
54
+ - glossary: update description of head and ref
55
+ - glossary: update description of "tag"
56
+ - git.txt: de-emphasize the implementation detail of a ref
57
+ - check-ref-format doc: de-emphasize the implementation detail of a ref
58
+ - git-remote.txt: avoid sounding as if loose refs are the only ones in the world
59
+ - git-remote.txt: fix wrong remote refspec
60
+
61
+Will merge to 'next'.
62
+
63
+* jc/submodule-sync-no-auto-vivify (2011-06-26) 2 commits
64
+ - submodule add: always initialize .git/config entry
65
+ - submodule sync: do not auto-vivify uninteresting submodule
66
+
67
+* jn/gitweb-search (2011-06-22) 4 commits
68
+ - gitweb: Make git_search_* subroutines render whole pages
69
+ - gitweb: Clean up code in git_search_* subroutines
70
+ - gitweb: Split body of git_search into subroutines
71
+ - gitweb: Check permissions first in git_search
72
+
73
+--------------------------------------------------
74
+[Graduated to "master"]
75
+
76
+* db/http-cookies (2011-06-03) 1 commit
77
+ (merged to 'next' on 2011-06-06 at 90d736a)
78
+ + http: pass http.cookiefile using CURLOPT_COOKIEFILE
79
+
80
+* ef/maint-win-verify-path (2011-06-08) 5 commits
81
+ - verify_dotfile(): do not assume '/' is the path seperator
82
+ (merged to 'next' on 2011-06-07 at b418e05)
83
+ + verify_path(): simplify check at the directory boundary
84
+ (merged to 'next' on 2011-06-01 at f316f68)
85
+ + verify_path: consider dos drive prefix
86
+ + real_path: do not assume '/' is the path seperator
87
+ + A Windows path starting with a backslash is absolute
88
+
89
+* jc/advice-about-to-lose-commit (2011-05-24) 1 commit
90
+ (merged to 'next' on 2011-05-30 at 42385cc)
91
+ + checkout: make advice when reattaching the HEAD less loud
92
+
93
+* jc/diff-index-quick-exit-early (2011-05-31) 2 commits
94
+ (merged to 'next' on 2011-06-01 at 79d868a)
95
+ + diff-index --quiet: learn the "stop feeding the backend early" logic
96
+ + Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
97
+
98
+* jc/maint-1.7.3-checkout-describe (2011-06-05) 1 commit
99
+ (merged to 'next' on 2011-06-06 at 6a59bb7)
100
+ + checkout -b <name>: correctly detect existing branch
101
+
102
+* jk/combine-diff-binary-etc (2011-05-24) 5 commits
103
+ (merged to 'next' on 2011-05-24 at 07cf180)
104
+ + combine-diff: respect textconv attributes
105
+ + refactor get_textconv to not require diff_filespec
106
+ + combine-diff: handle binary files as binary
107
+ + combine-diff: calculate mode_differs earlier
108
+ + combine-diff: split header printing into its own function
109
+
110
+* jk/maint-1.7.2-status-ignored (2011-06-02) 2 commits
111
+ (merged to 'next' on 2011-06-02 at 8626cc6)
112
+ + git status --ignored: tests and docs
113
+ + status: fix bug with missing --ignore files
114
+
115
+* jk/transport-helper-fix (2011-06-07) 8 commits
116
+ . git_remote_helpers: push all refs during a non-local export
117
+ . transport-helper: don't feed bogus refs to export push
118
+ . teach remote-testgit to import multiple refs
119
+ . teach remote-testgit to import non-HEAD refs
120
+ . t5800: document some non-functional parts of remote helpers
121
+ . t5800: factor out some ref tests
122
+ . git-remote-testgit: exit gracefully after push
123
+ . transport-helper: fix minor leak in push_refs_with_export
124
+
125
+sr/transport-helper-fix is a superset of this.
126
+
127
+* js/i18n-windows (2011-06-06) 3 commits
128
+ (merged to 'next' on 2011-06-06 at d8c4ba3)
129
+ + Windows: teach getenv to do a case-sensitive search
130
+ + mingw.c: move definition of mingw_getenv down
131
+ + sh-i18n--envsubst: do not crash when no arguments are given
132
+
133
+* mg/diff-stat-count (2011-05-27) 4 commits
134
+ (merged to 'next' on 2011-06-01 at 5cdb776)
135
+ + diff --stat-count: finishing touches
136
+ + diff-options.txt: describe --stat-{width,name-width,count}
137
+ + diff: introduce --stat-lines to limit the stat lines
138
+ + diff.c: omit hidden entries from namelen calculation with --stat
139
+
140
+* rs/grep-color (2011-06-05) 3 commits
141
+ (merged to 'next' on 2011-06-06 at fd6bae1)
142
+ + grep: add --heading
143
+ + grep: add --break
144
+ + grep: fix coloring of hunk marks between files
145
+
146
+--------------------------------------------------
147
+[Stalled]
148
+
149
+* jh/receive-count-limit (2011-05-23) 10 commits
150
+ - receive-pack: Allow server to refuse pushes with too many objects
151
+ - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
152
+ - send-pack/receive-pack: Allow server to refuse pushing too large packs
153
+ - pack-objects: Allow --max-pack-size to be used together with --stdout
154
+ - send-pack/receive-pack: Allow server to refuse pushes with too many commits
155
+ - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
156
+ - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
157
+ - Tighten rules for matching server capabilities in server_supports()
158
+ - send-pack: Attempt to retrieve remote status even if pack-objects fails
159
+ - Update technical docs to reflect side-band-64k capability in receive-pack
160
+
161
+Would need another round to separate per-pack and per-session limits.
162
+Not urgent. Will not merge before 1.7.6.
163
164
* sr/transport-helper-fix (2011-06-19) 20 commits
165
- transport-helper: implement marks location as capability
@@ -46,17 +187,38 @@ At least Patch 10/20 (git-remote-testgit: fix error handling) and Patch
187
15/20 (transport-helper: use the new done feature where possible) need a
188
reroll.
189
190
+* jm/mergetool-pathspec (2011-06-22) 2 commits
191
+ - mergetool: Don't assume paths are unmerged
192
+ - mergetool: Add tests for filename with whitespace
193
+
194
+I think this is a good idea, but it probably needs a re-roll.
195
+
196
+--------------------------------------------------
197
+[Cooking]
198
+
199
+* ak/gcc46-profile-feedback (2011-06-20) 3 commits
200
+ - Add explanation of the profile feedback build to the README
201
+ - Add profile feedback build to git
202
+ - Add option to disable NORETURN
203
+
204
+Will merge to 'next'.
205
+
206
* jc/maint-cygwin-trust-executable-bit-default (2011-06-20) 1 commit
207
- cygwin: trust executable bit by default
208
209
Fix for an ancient regression.
210
+Will merge to 'next'.
211
212
* jk/tag-list-multiple-patterns (2011-06-20) 1 commit
213
- tag: accept multiple patterns for --list
214
215
+Will merge to 'next' later.
216
+
217
* jl/maint-fetch-recursive-fix (2011-06-20) 1 commit
218
- fetch: Also fetch submodules in subdirectories in on-demand mode
219
220
+Will merge to 'next'.
221
+
222
* rr/revert-cherry-pick-continue (2011-06-21) 13 commits
223
- revert: Introduce --continue to continue the operation
224
- revert: Introduce skip-all to cleanup sequencer data
@@ -77,6 +239,8 @@ Under discussion, just queued here so that it is not lost.
239
* fk/relink-upon-ldflags-update (2011-06-22) 1 commit
240
- Makefile: Track changes to LDFLAGS and relink when necessary
241
242
+Will merge to 'next'.
243
+
244
* jk/maint-config-param (2011-06-22) 6 commits
245
- config: use strbuf_split_str instead of a temporary strbuf
246
- strbuf: allow strbuf_split to work on non-strbufs
@@ -87,41 +251,18 @@ Under discussion, just queued here so that it is not lost.
251
(this branch is used by jk/clone-cmdline-config.)
252
253
Separated earlier parts of jk/clone-cmdline-config for maint.
90
-
91
-* jm/mergetool-pathspec (2011-06-22) 2 commits
92
- - mergetool: Don't assume paths are unmerged
93
- - mergetool: Add tests for filename with whitespace
94
-
95
-I think this is a good idea, but it probably needs a re-roll.
254
+Will merge to 'next' later.
255
256
* jn/gitweb-split-header-html (2011-06-22) 1 commit
257
- gitweb: Refactor git_header_html
258
100
---------------------------------------------------
101
-[Stalled]
102
-
103
-* jh/receive-count-limit (2011-05-23) 10 commits
104
- - receive-pack: Allow server to refuse pushes with too many objects
105
- - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
106
- - send-pack/receive-pack: Allow server to refuse pushing too large packs
107
- - pack-objects: Allow --max-pack-size to be used together with --stdout
108
- - send-pack/receive-pack: Allow server to refuse pushes with too many commits
109
- - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
110
- - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
111
- - Tighten rules for matching server capabilities in server_supports()
112
- - send-pack: Attempt to retrieve remote status even if pack-objects fails
113
- - Update technical docs to reflect side-band-64k capability in receive-pack
114
-
115
-Would need another round to separate per-pack and per-session limits.
116
-Not urgent. Will not merge before 1.7.6.
117
-
118
---------------------------------------------------
119
-[Cooking]
259
+Will merge to 'next' later.
260
261
* aw/rebase-i-p (2011-06-19) 1 commit
262
- rebase -i -p: include non-first-parent commits in todo list
263
264
Rerolled with a minor tweak.
265
+Will merge to 'next'.
266
267
* en/merge-recursive (2011-06-13) 49 commits
268
- t3030: fix accidental success in symlink rename
@@ -181,23 +322,36 @@ Haven't looked at the whole series yet.
322
- submodule update: continue when a checkout fails
323
- git-sh-setup: add die_with_status
324
325
+Will merge to 'next'.
326
+
327
* jc/no-gitweb-test-without-cgi-etc (2011-06-15) 1 commit
328
- t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
329
187
-* jn/mime-type-with-params (2011-06-13) 1 commit
188
- - gitweb: Make $prevent_xss protection for 'blob_plain' more usable
330
+Will merge to 'next'.
331
+
332
+* jn/mime-type-with-params (2011-06-30) 2 commits
333
+ - gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
334
+ - gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
335
+
336
+Will merge to 'next' later.
337
338
* ln/gitweb-mime-types-split-at-blank (2011-06-15) 1 commit
339
- gitweb: allow space as delimiter in mime.types
340
341
+Will merge to 'next'.
342
+
343
* md/interix-update (2011-06-15) 1 commit
344
- Update the Interix default build configuration.
345
346
+Will merge to 'next'.
347
+
348
* rj/config-cygwin (2011-06-16) 3 commits
349
- config.c: Make git_config() work correctly when called recursively
350
- t1301-*.sh: Fix the 'forced modes' test on cygwin
351
- help.c: Fix detection of custom merge strategy on cygwin
352
353
+Will merge to 'next'.
354
+
355
* jk/archive-tar-filter (2011-06-22) 9 commits
356
- upload-archive: allow user to turn off filters
357
- archive: provide builtin .tar.gz filter
@@ -210,6 +364,7 @@ Haven't looked at the whole series yet.
364
- archive: reorder option parsing and config reading
365
366
Rerolled.
367
+Will merge to 'next' later.
368
369
* jc/index-pack (2011-06-05) 9 commits
370
- verify-pack: use index-pack --verify
@@ -225,25 +380,19 @@ Rerolled.
380
Killed "verify-pack" ;-) The next will be to update fsck, which would be a
381
bigger task.
382
228
-Not urgent. Will not merge before 1.7.6.
229
-
230
-* js/i18n-windows (2011-06-06) 3 commits
231
- (merged to 'next' on 2011-06-06 at d8c4ba3)
232
- + Windows: teach getenv to do a case-sensitive search
233
- + mingw.c: move definition of mingw_getenv down
234
- + sh-i18n--envsubst: do not crash when no arguments are given
235
-
236
-Not urgent. Will not merge before 1.7.6.
383
+Will merge to 'next' later.
384
385
* an/shallow-doc (2011-06-08) 2 commits
386
- Document the underlying protocol used by shallow repositories and --depth commands.
387
- Fix documentation of fetch-pack that implies that the client can disconnect after sending wants.
388
242
-Not waiting for a review any longer; looked sensible.
389
+Will merge to 'next'.
390
391
* jc/legacy-loose-object (2011-06-08) 1 commit
392
- sha1_file.c: "legacy" is really the current format
393
394
+Will merge to 'next'.
395
+
396
* jc/zlib-wrap (2011-06-10) 7 commits
397
- zlib: allow feeding more than 4GB in one go
398
- zlib: zlib can only process 4GB at a time
@@ -256,6 +405,8 @@ Not waiting for a review any longer; looked sensible.
405
This replaces the earlier attempt to deal with the mismatch between our
406
expectation and what zlib API actually offers piecemeal.
407
408
+Will merge to 'next' later.
409
+
410
* jk/clone-cmdline-config (2011-06-22) 4 commits
411
- clone: accept config options on the command line
412
- config: make git_config_parse_parameter a public function
@@ -266,107 +417,53 @@ expectation and what zlib API actually offers piecemeal.
417
Separated the earlier parts out to make it mergeable to the maintenance
418
track.
419
269
-* jk/tag-contains-ab (2011-06-11) 4 commits
270
- - Why is "git tag --contains" so slow?
420
+Will merge to 'next' later.
421
+
422
+* jk/tag-contains-ab (2011-06-30) 4 commits
423
+ - git skew: a tool to find how big a clock skew exists in the history
424
- default core.clockskew variable to one day
425
- limit "contains" traversals based on commit timestamp
426
- tag: speed up --contains calculation
427
275
-* db/http-cookies (2011-06-03) 1 commit
276
- (merged to 'next' on 2011-06-06 at 90d736a)
277
- + http: pass http.cookiefile using CURLOPT_COOKIEFILE
278
-
279
-Fairly trivial enhancement.
280
-Not urgent. Will not merge before 1.7.6.
281
-
282
-* jc/maint-1.7.3-checkout-describe (2011-06-05) 1 commit
283
- (merged to 'next' on 2011-06-06 at 6a59bb7)
284
- + checkout -b <name>: correctly detect existing branch
285
-
286
-Fairly trivial bugfix.
287
-Not urgent. Will not merge before 1.7.6.
428
+Will merge to 'next' later (at least the first three).
429
289
-* jk/clone-detached (2011-06-07) 5 commits
290
- . remote-testgit: short-term fix to allow t5800 pass
430
+* jk/clone-detached (2011-06-07) 4 commits
431
- clone: always fetch remote HEAD
432
- make copy_ref globally available
433
- consider only branches in guess_remote_head
434
- t: add tests for cloning remotes with detached HEAD
435
436
Somewhat involved bugfix.
297
-Not urgent. Will not merge before 1.7.6.
298
-
299
-* jk/maint-1.7.2-status-ignored (2011-06-02) 2 commits
300
- (merged to 'next' on 2011-06-02 at 8626cc6)
301
- + git status --ignored: tests and docs
302
- + status: fix bug with missing --ignore files
303
-
304
-Fairly trivial bugfix.
305
-Not urgent. Will not merge before 1.7.6.
437
+Seems to break 5800 when used with submodule-sync-no-auto-vivify fix.
438
439
* jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits
440
- submodule add: clean up duplicated code
441
- submodule add: allow relative repository path even when no url is set
442
- submodule add: test failure when url is not configured in superproject
443
312
-Not urgent. Will not merge before 1.7.6.
313
-
314
-* rs/grep-color (2011-06-05) 3 commits
315
- (merged to 'next' on 2011-06-06 at fd6bae1)
316
- + grep: add --heading
317
- + grep: add --break
318
- + grep: fix coloring of hunk marks between files
319
-
320
-Fairly straightforward feature enhancement.
321
-Not urgent. Will not merge before 1.7.6.
322
-
323
-* jc/diff-index-quick-exit-early (2011-05-31) 2 commits
324
- (merged to 'next' on 2011-06-01 at 79d868a)
325
- + diff-index --quiet: learn the "stop feeding the backend early" logic
326
- + Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early
327
-
328
-Not urgent. Will not merge before 1.7.6.
329
-
330
-* ef/maint-win-verify-path (2011-06-08) 5 commits
331
- - verify_dotfile(): do not assume '/' is the path seperator
332
- (merged to 'next' on 2011-06-07 at b418e05)
333
- + verify_path(): simplify check at the directory boundary
334
- (merged to 'next' on 2011-06-01 at f316f68)
335
- + verify_path: consider dos drive prefix
336
- + real_path: do not assume '/' is the path seperator
337
- + A Windows path starting with a backslash is absolute
338
-
339
-Not urgent, but is sane. Will not merge before 1.7.6.
444
+When merged to pu, it seems to break 7610.
445
446
* jn/gitweb-js-blame (2011-05-27) 3 commits
342
- (merged to 'next' on 2011-06-01 at a984a1b)
447
+ (merged to 'next' on 2011-06-29 at cce347d)
448
+ gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
449
+ gitweb.js: No need for loop in blame_incremental's handleResponse()
450
+ gitweb.js: No need for inProgress in blame_incremental.js
451
347
-Will cook a bit longer.
348
-
349
-* mg/diff-stat-count (2011-05-27) 4 commits
350
- (merged to 'next' on 2011-06-01 at 5cdb776)
351
- + diff --stat-count: finishing touches
352
- + diff-options.txt: describe --stat-{width,name-width,count}
353
- + diff: introduce --stat-lines to limit the stat lines
354
- + diff.c: omit hidden entries from namelen calculation with --stat
355
-
356
-Not urgent. Will not merge before 1.7.6.
452
+Originally merged to 'next' on 2011-06-01.
453
+Will merge to 'master'.
454
455
* da/git-prefix-everywhere (2011-06-02) 4 commits
359
- (merged to 'next' on 2011-06-02 at 2ab66e7)
456
+ (merged to 'next' on 2011-06-29 at 4ed5461)
457
+ t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests
361
- (merged to 'next' on 2011-05-30 at 9480900)
458
+ git-mergetool--lib: Make vimdiff retain the current directory
459
+ git: Remove handling for GIT_PREFIX
460
+ setup: Provide GIT_PREFIX to built-ins
461
366
-Not urgent. Will not merge before 1.7.6.
462
+Originally merged to 'next' on 2011-06-02.
463
+Will merge to 'master'.
464
465
* jc/streaming-filter (2011-05-26) 8 commits
369
- (merged to 'next' on 2011-06-06 at 8ed6b3d)
466
+ (merged to 'next' on 2011-06-29 at 9901923)
467
+ t0021: test application of both crlf and ident
468
+ t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
469
+ streaming: filter cascading
@@ -379,28 +476,13 @@ Not urgent. Will not merge before 1.7.6.
476
477
Trivial lf-to-crlf and ident conversions can be performed without reading
478
everything in-core first.
382
-Not urgent. Will not merge before 1.7.6.
383
-
384
-* jk/combine-diff-binary-etc (2011-05-24) 5 commits
385
- (merged to 'next' on 2011-05-24 at 07cf180)
386
- + combine-diff: respect textconv attributes
387
- + refactor get_textconv to not require diff_filespec
388
- + combine-diff: handle binary files as binary
389
- + combine-diff: calculate mode_differs earlier
390
- + combine-diff: split header printing into its own function
391
-
392
-Not urgent. Will not merge before 1.7.6.
479
394
-* jc/advice-about-to-lose-commit (2011-05-24) 1 commit
395
- (merged to 'next' on 2011-05-30 at 42385cc)
396
- + checkout: make advice when reattaching the HEAD less loud
397
-
398
-Not urgent. Will not merge before 1.7.6.
480
+Originally merged to 'next' on 2011-06-06.
481
+Will merge to 'master'.
482
483
* jc/streaming (2011-05-26) 14 commits
401
- (merged to 'next' on 2011-05-26 at 7fdda8d)
484
+ (merged to 'next' on 2011-06-29 at 55ac692)
485
+ sha1_file: use the correct type (ssize_t, not size_t) for read-style function
403
- (merged to 'next' on 2011-05-23 at 7fd0b52)
486
+ streaming: read loose objects incrementally
487
+ sha1_file.c: expose helpers to read loose objects
488
+ streaming: read non-delta incrementally from a pack
@@ -416,10 +498,11 @@ Not urgent. Will not merge before 1.7.6.
498
+ Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
499
(this branch is used by jc/streaming-filter.)
500
419
-Not urgent. Will not merge before 1.7.6.
501
+Originally merged to 'next' on 2011-05-26.
502
+Will merge to 'master'.
503
504
* ab/i18n-scripts (2011-05-21) 48 commits
422
- (merged to 'next' on 2011-05-23 at 69164a3)
505
+ (merged to 'next' on 2011-06-29 at 61f4472)
506
+ i18n: git-bisect bisect_next_check "You need to" message
507
+ i18n: git-bisect [Y/n] messages
508
+ i18n: git-bisect bisect_replay + $1 messages
@@ -469,23 +552,12 @@ Not urgent. Will not merge before 1.7.6.
552
+ i18n: git-am one-line gettext $msg; echo
553
+ i18n: git-am add git-sh-i18n
554
472
-Rerolled.
555
+Originally merged to 'next' on 2011-05-23.
556
+Will merge to 'master'.
557
558
--------------------------------------------------
559
[Discarded]
560
477
-* jk/transport-helper-fix (2011-06-07) 8 commits
478
- . git_remote_helpers: push all refs during a non-local export
479
- . transport-helper: don't feed bogus refs to export push
480
- . teach remote-testgit to import multiple refs
481
- . teach remote-testgit to import non-HEAD refs
482
- . t5800: document some non-functional parts of remote helpers
483
- . t5800: factor out some ref tests
484
- . git-remote-testgit: exit gracefully after push
485
- . transport-helper: fix minor leak in push_refs_with_export
486
-
487
-sr/transport-helper-fix is a superset of this.
488
-
561
* js/ref-namespaces (2011-06-07) 4 commits
562
. ref namespaces: documentation
563
. ref namespaces: support remote repositories via upload-pack and receive-pack