What's cooking (2012/08 #06)
Junio C Hamano committed
Aug 21, 2012 at 16:04 UTC
8714ff61d02d6de0fde31af5ed2072bc60e0fddc
1 file changed
+285
-177
whats-cooking.txt
+285
-177
@@ -1,41 +1,19 @@
1
To: git@vger.kernel.org
2
-Cc: Eric Wong <normalperson@yhbt.net>,
3
- Pete Wyckoff <pw@padd.com>,
4
- Luke Diamand <luke@diamand.org>,
5
- Erik Faye-Lund <kusmabite@gmail.com>,
6
- Stefan Zager <szager@google.com>
2
Bcc: lwn@lwn.net
8
-Subject: What's cooking in git.git (Aug 2012, #06; Sun, 19)
3
+Subject: What's cooking in git.git (Aug 2012, #06; Tue, 21)
4
X-master-at: 889d35899ba64640e47798681ecb34a4be043bad
10
-X-next-at: d66298809de5c57cf7578f0abaa9088f2784c3c9
5
+X-next-at: 332afe444c0ae4d1fa700e16c4e23b42960792b4
6
12
-What's cooking in git.git (Aug 2012, #06; Sun, 19)
7
+What's cooking in git.git (Aug 2012, #06; Tue, 21)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
11
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
12
18
-Now 1.7.12 is out, we will have a few days of calming down period on
19
-the 'master' front, just in case we have to deal with brown paper
20
-bag post-release fixes, and then start getting the topics that have
21
-been cooking on the 'next' branch graduate to the 'master', perhaps
22
-starting on coming Wednesday.
23
-
24
-For this cycle, we already have fairly well cooked topics, many of
25
-which are on 'next', and the git-svn updates for svn 1.7 by Michael
26
-G Schwern is also a candidate for early graduation, provided if Eric
27
-is OK with the series (I'd need to double check with him). There
28
-also were some topics that were almost there already during their
29
-review discussions but somehow lost momentum when we got distracted,
30
-and I think most of them would be ready fairly quickly if the
31
-respective owners of the topics (you know who you are) can find time
32
-to put some work into them.
33
-
34
-So I'm planning to keep this cycle reasonably short and aim for
35
-tagging the result as 1.8.0 at the end of 9th week, on October 21st,
36
-after which I'd disappear for a few weeks.
37
-http://tinyurl.com/gitCal is where you can always find my rough
38
-tagging schedule at.
13
+I'm planning to keep this cycle reasonably short and aim for tagging
14
+the result as 1.8.0 at the end of 9th week, on October 21st, after
15
+which I'd disappear for a few weeks. http://tinyurl.com/gitCal is
16
+where you can always find my rough tagging schedule at.
17
18
You can find the changes described here in the integration branches of the
19
repositories listed at
@@ -45,7 +23,7 @@ repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
48
-* kk/maint-for-each-ref-multi-sort (2012-08-19) 2 commits
26
+* kk/maint-for-each-ref-multi-sort (2012-08-21) 2 commits
27
- for-each-ref: Fix sort with multiple keys
28
- t6300: test sort with multiple keys
29
@@ -53,9 +31,109 @@ A small and sensible fix, even though the accompanying test seems to
31
touch too many unrelated existing ones needlessly, which may want to
32
be fixed by a reroll.
33
34
+* nd/i18n-parseopt-help (2012-08-20) 54 commits
35
+ - i18n: shortlog: mark parseopt strings for translation
36
+ - i18n: rm: mark parseopt strings for translation
37
+ - i18n: revert, cherry-pick: mark parseopt strings for translation
38
+ - i18n: rev-parse: mark parseopt strings for translation
39
+ - i18n: reset: mark parseopt strings for translation
40
+ - i18n: rerere: mark parseopt strings for translation
41
+ - i18n: status: mark parseopt strings for translation
42
+ - i18n: replace: mark parseopt strings for translation
43
+ - i18n: remote: mark parseopt strings for translation
44
+ - i18n: read-tree: mark parseopt strings for translation
45
+ - i18n: push: mark parseopt strings for translation
46
+ - i18n: prune: mark parseopt strings for translation
47
+ - i18n: prune-packed: mark parseopt strings for translation
48
+ - i18n: pack-refs: mark parseopt strings for translation
49
+ - i18n: pack-objects: mark parseopt strings for translation
50
+ - i18n: notes: mark parseopt strings for translation
51
+ - i18n: name-rev: mark parseopt strings for translation
52
+ - i18n: mv: mark parseopt strings for translation
53
+ - i18n: mktree: mark parseopt strings for translation
54
+ - i18n: merge: mark parseopt strings for translation
55
+ - i18n: merge-file: mark parseopt strings for translation
56
+ - i18n: merge-base: mark parseopt strings for translation
57
+ - i18n: ls-tree: mark parseopt strings for translation
58
+ - i18n: ls-files: mark parseopt strings for translation
59
+ - i18n: log: mark parseopt strings for translation
60
+ - i18n: init-db: mark parseopt strings for translation
61
+ - i18n: help: mark parseopt strings for translation
62
+ - i18n: hash-object: mark parseopt strings for translation
63
+ - i18n: grep: mark parseopt strings for translation
64
+ - i18n: gc: mark parseopt strings for translation
65
+ - i18n: fsck: mark parseopt strings for translation
66
+ - i18n: format-patch: mark parseopt strings for translation
67
+ - i18n: for-each-ref: mark parseopt strings for translation
68
+ - i18n: fmt-merge-msg: mark parseopt strings for translation
69
+ - i18n: fetch: mark parseopt strings for translation
70
+ - i18n: fast-export: mark parseopt strings for translation
71
+ - i18n: describe: mark parseopt strings for translation
72
+ - i18n: config: mark parseopt strings for translation
73
+ - i18n: count-objects: mark parseopt strings for translation
74
+ - i18n: commit: mark parseopt strings for translation
75
+ - i18n: column: mark parseopt strings for translation
76
+ - i18n: clone: mark parseopt strings for translation
77
+ - i18n: clean: mark parseopt strings for translation
78
+ - i18n: cherry: mark parseopt strings for translation
79
+ - i18n: checkout: mark parseopt strings for translation
80
+ - i18n: checkout-index: mark parseopt strings for translation
81
+ - i18n: check-attr: mark parseopt strings for translation
82
+ - i18n: cat-file: mark parseopt strings for translation
83
+ - i18n: branch: mark parseopt strings for translation
84
+ - i18n: blame: mark parseopt strings for translation
85
+ - i18n: add: mark parseopt strings for translation
86
+ - i18n: bisect--helper: mark parseopt strings for translation
87
+ - i18n: archive: mark parseopt strings for translation
88
+ - i18n: mark "style" in OPT_COLUMN() for translation
89
+
90
+A lot of i18n mark-up for the help text from "git <cmd> -h".
91
+
92
+* tr/maint-parseopt-avoid-empty (2012-08-20) 1 commit
93
+ - gettext: do not translate empty string
94
+
95
+A workaround to avoid doing _(""), which translates to magic string
96
+in the .po files.
97
+
98
+* jk/config-warn-on-inaccessible-paths (2012-08-21) 4 commits
99
+ - warn_on_inaccessible(): a helper to warn on inaccessible paths
100
+ - attr: warn on inaccessible attribute files
101
+ - gitignore: report access errors of exclude files
102
+ - config: warn on inaccessible files
103
+
104
+When looking for $HOME/.gitconfig etc., it is OK if we cannot read
105
+them because they do not exist, but unable to read existing ones
106
+need to be diagnosed.
107
+
108
+* nd/i18n-poison-test-updates (2012-08-21) 6 commits
109
+ - Fix tests under GETTEXT_POISON on parseopt
110
+ - Fix tests under GETTEXT_POISON on pack-object
111
+ - Fix tests under GETTEXT_POISON on git-apply
112
+ - Fix tests under GETTEXT_POISON on diffstat
113
+ - Fix tests under GETTEXT_POISON on git-stash
114
+ - Fix tests under GETTEXT_POISON on relative dates
115
+
116
+Updates to tests that can be broken with gettext-poison builds.
117
+
118
--------------------------------------------------
119
[Stalled]
120
121
+* pw/p4-submit-conflicts (2012-08-16) 12 commits
122
+ - git p4: add submit --prepare-p4-only option
123
+ - git p4: add submit --dry-run option
124
+ - git p4: accept -v for --verbose
125
+ - git p4: revert deleted files after submit cancel
126
+ - git p4: rearrange submit template construction
127
+ - git p4: test clean-up after failed submit, fix added files
128
+ - git p4: standardize submit cancel due to unchanged template
129
+ - git p4: move conflict prompt into run, use [c]ontinue and [q]uit
130
+ - git p4: remove submit failure options [a]pply and [w]rite
131
+ - git p4: gracefully fail if some commits could not be applied
132
+ - git p4 test: use p4d -L option to suppress log messages
133
+ - git p4 test: remove bash-ism of combined export/assignment
134
+
135
+Waiting for the dust to settle.
136
+
137
* mz/rebase-range (2012-07-18) 7 commits
138
. rebase (without -p): correctly calculate patches to rebase
139
. rebase -p: don't request --left-right only to ignore left side
@@ -137,9 +215,11 @@ working :-<.
215
[Cooking]
216
217
* hv/coding-guidelines (2012-08-15) 1 commit
140
- (merged to 'next' on 2012-08-18 at 5a78f2c)
218
+ (merged to 'next' on 2012-08-20 at 4984865)
219
+ Documentation/CodingGuidelines: spell out more shell guidelines
220
221
+(Originally merged to 'next' on 2012-08-18)
222
+
223
In earlier days, "imitate the style in the neibouring code" was
224
sufficient to keep the coherent style, but over time some parts of
225
the codebase have drifted enough to make it ineffective.
@@ -147,39 +227,20 @@ the codebase have drifted enough to make it ineffective.
227
Will merge to 'master' as part of the first batch.
228
229
* jc/daemon-access-hook (2012-08-15) 1 commit
150
- - daemon: --access-hook option
230
+ (merged to 'next' on 2012-08-20 at c8f5b2e)
231
+ + daemon: --access-hook option
232
233
Allow an external command to tell git-daemon to decline service
234
based on the client address, repository path, etc.
235
155
-Will merge to 'next'.
156
-
236
* jc/send-email-reconfirm (2012-08-14) 1 commit
158
- - send-email: validate & reconfirm interactive responses
237
+ (merged to 'next' on 2012-08-20 at dffdef6)
238
+ + send-email: validate & reconfirm interactive responses
239
240
Validate interactive input to "git send-email" to avoid common
241
mistakes such as saying "y<RETURN>" to sender mail address whose
242
prompt is given with a correctly guessed default.
243
164
-Will merge to 'next'.
165
-
166
-* pw/p4-submit-conflicts (2012-08-16) 12 commits
167
- - git p4: add submit --prepare-p4-only option
168
- - git p4: add submit --dry-run option
169
- - git p4: accept -v for --verbose
170
- - git p4: revert deleted files after submit cancel
171
- - git p4: rearrange submit template construction
172
- - git p4: test clean-up after failed submit, fix added files
173
- - git p4: standardize submit cancel due to unchanged template
174
- - git p4: move conflict prompt into run, use [c]ontinue and [q]uit
175
- - git p4: remove submit failure options [a]pply and [w]rite
176
- - git p4: gracefully fail if some commits could not be applied
177
- - git p4 test: use p4d -L option to suppress log messages
178
- - git p4 test: remove bash-ism of combined export/assignment
179
-
180
-I saw Pete and Luke going back and forth collaborating, so I take
181
-that this may still be rerolled---if not, please holler.
182
-
244
* tx/relative-in-the-future (2012-08-16) 2 commits
245
- date: show relative dates in the future
246
- date: refactor the relative date logic from presentation
@@ -188,16 +249,18 @@ Not my itch; rewritten an earlier submission by Tom Xue into
249
somewhat more maintainable form, though it breaks existing i18n.
250
251
* ef/win32-cred-helper (2012-08-16) 1 commit
191
- - contrib: add win32 credential-helper
192
-
193
-Credential helper for Win32 (is this GUI???).
252
+ (merged to 'next' on 2012-08-20 at bd5c651)
253
+ + contrib: add win32 credential-helper
254
195
-Will merge to 'next'.
255
+Credential helper for Win32 to allow access to the keychain of
256
+the logged-in user.
257
258
* jc/maint-abbrev-option-cli (2012-08-16) 1 commit
198
- (merged to 'next' on 2012-08-18 at e002006)
259
+ (merged to 'next' on 2012-08-20 at 54d1a5a)
260
+ gitcli: describe abbreviation of long options
261
262
+(Originally merged to 'next' on 2012-08-18)
263
+
264
We did not document that many commands take unique prefix
265
abbreviations of long options (e.g. "--option" may be the only flag
266
that the command accepts that begin with "--opt", in which case you
@@ -206,26 +269,31 @@ can give "--opt") anywhere easy to find for new people.
269
Will merge to 'master' as part of the first batch.
270
271
* mv/pull-r-for-rebase (2012-08-17) 1 commit
209
- (merged to 'next' on 2012-08-18 at e7d885b)
272
+ (merged to 'next' on 2012-08-20 at 9743071)
273
+ man: git pull -r is a short for --rebase
274
212
-Minor documentation update.
275
+(Originally merged to 'next' on 2012-08-18)
276
+
277
+A minor documentation update.
278
279
Will merge to 'master' as part of the first batch.
280
216
-* rr/precompose-utf8-cleanup (2012-08-17) 1 commit
217
- - cleanup precompose_utf8
281
+* rr/precompose-utf8-cleanup (2012-08-20) 2 commits
282
+ (merged to 'next' on 2012-08-20 at a883c2a)
283
+ + precompose-utf8: do not call checks for non-ascii "utf8"
284
+ + cleanup precompose_utf8
285
286
A style and code cleanup.
220
-Will merge to 'next'.
287
288
* jc/doc-git-updates (2012-08-17) 1 commit
223
- (merged to 'next' on 2012-08-18 at f24913b)
289
+ (merged to 'next' on 2012-08-20 at ab1db71)
290
+ Documentation: update the introductory section
291
292
+(Originally merged to 'next' on 2012-08-18)
293
+
294
Will merge to 'master' as part of the first batch.
295
228
-* fa/remote-svn (2012-08-17) 16 commits
296
+* fa/remote-svn (2012-08-20) 16 commits
297
- Add a test script for remote-svn
298
- remote-svn: add marks-file regeneration
299
- Add a svnrdump-simulator replaying a dump file for testing
@@ -240,47 +308,39 @@ Will merge to 'master' as part of the first batch.
308
- Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
309
- Add argv_array_detach and argv_array_free_detached
310
- Add svndump_init_fd to allow reading dumps from arbitrary FDs
243
- - Integrate remote-svn into svn-fe/Makefile
311
+ - Add git-remote-testsvn to Makefile
312
- Implement a remote helper for svn in C
313
(this branch is used by fa/vcs-svn.)
314
247
-* fa/vcs-svn (2012-08-18) 7 commits
248
- - fixup: add missing cast to vcs-svn/fast_export.c
249
- - fixup - no old style defn
315
+* fa/vcs-svn (2012-08-20) 4 commits
316
- vcs-svn: remove repo_tree
317
- vcs-svn/svndump: rewrite handle_node(), begin|end_revision()
318
- vcs-svn/svndump: restructure node_ctx, rev_ctx handling
319
- svndump: move struct definitions to .h
254
- - vcs-svn: Add sha1 calculation to fast_export and line_buffer
320
(this branch uses fa/remote-svn.)
321
257
-I haven't seen many comments and reviews from people involved in the
258
-area, other than DBarr's worries on teaching exporter (which is
259
-supposed to be Git agnostic, as its output "fast-import" format is
260
-meant to be usable by others) to compute object names in Git way.
261
-
262
-It is somewhat hard for me to judge these two series.
322
+Rerolled with another round of fix-up squashed in.
323
324
* mh/maint-config-doc-proxy-command (2012-08-18) 2 commits
265
- - git-config doc: unconfuse an example
266
- - git-config.txt: fix example
325
+ (merged to 'next' on 2012-08-20 at a484625)
326
+ + git-config doc: unconfuse an example
327
+ + git-config.txt: fix example
328
268
-Will merge to 'next'.
329
+A minor documentation update.
330
331
* ph/stash-rerere (2012-08-17) 2 commits
271
- - stash: invoke rerere in case of conflict
272
- - test: git-stash conflict sets up rerere
332
+ (merged to 'next' on 2012-08-20 at ae37111)
333
+ + stash: invoke rerere in case of conflict
334
+ + test: git-stash conflict sets up rerere
335
336
"git stash" internally used "git merge-recursive" backend, which did
337
not trigger "rerere" upon conflicts unlike other mergy operations.
338
277
-Will merge to 'next'.
278
-
339
* hv/submodule-path-unmatch (2012-08-14) 1 commit
280
- - Let submodule command exit with error status if path does not exist
340
+ (merged to 'next' on 2012-08-20 at cbe6483)
341
+ + Let submodule command exit with error status if path does not exist
342
343
As the title says.
283
-Will merge to 'next'.
344
345
* jc/add-delete-default (2012-08-13) 1 commit
346
- git add: notice removal of tracked paths by default
@@ -293,9 +353,11 @@ Resurrected from graveyard, as I thought it was a worthwhile thing
353
to do in the longer term; waiting for comments.
354
355
* jc/maint-rev-list-topo-doc (2012-08-15) 1 commit
296
- (merged to 'next' on 2012-08-18 at d1f54d9)
356
+ (merged to 'next' on 2012-08-20 at 0f669d2)
357
+ rev-list docs: clarify --topo-order description
358
359
+(Originally merged to 'next' on 2012-08-18)
360
+
361
It was unclear what "--topo-order" was really about in the
362
documentation. It is not just about "children before parent", but
363
also about "don't mix lineages".
@@ -303,10 +365,12 @@ also about "don't mix lineages".
365
Will merge to 'master' as part of the first batch.
366
367
* bc/receive-pack-stdout-protection (2012-08-06) 2 commits
306
- (merged to 'next' on 2012-08-07 at d7aa316)
368
+ (merged to 'next' on 2012-08-20 at b1b0d18)
369
+ receive-pack: do not leak output from auto-gc to standard output
370
+ t/t5400: demonstrate breakage caused by informational message from prune
371
372
+(Originally merged to 'next' on 2012-08-07)
373
+
374
When "git push" triggered the automatic gc on the receiving end, a
375
message from "git prune" that said it was removing cruft leaked to
376
the standard output, breaking the communication protocol.
@@ -314,16 +378,17 @@ the standard output, breaking the communication protocol.
378
Will merge to 'master' as part of the second batch.
379
380
* bc/prune-info (2012-08-07) 1 commit
317
- - prune.c: only print informational message in show_only or verbose mode
381
+ (merged to 'next' on 2012-08-20 at 1bc9e66)
382
+ + prune.c: only print informational message in show_only or verbose mode
383
384
Teach "git prune" without "-v" to be silent about leftover temporary files.
385
321
-Will merge to 'next'.
322
-
386
* jc/tag-doc (2012-08-06) 1 commit
324
- (merged to 'next' on 2012-08-18 at 9fe64b2)
387
+ (merged to 'next' on 2012-08-20 at 9eb658e)
388
+ Documentation: do not mention .git/refs/* directories
389
390
+(Originally merged to 'next' on 2012-08-18)
391
+
392
Our documentation used to assume having files in .git/refs/*
393
directories was the only to have branches and tags, but that is not
394
true for quite some time.
@@ -331,9 +396,11 @@ true for quite some time.
396
Will merge to 'master' as part of the first batch.
397
398
* jk/docs-docbook-monospace-display (2012-08-07) 1 commit
334
- (merged to 'next' on 2012-08-18 at 7e02bf8)
399
+ (merged to 'next' on 2012-08-20 at 0ed30dc)
400
+ docs: monospace listings in docbook output
401
402
+(Originally merged to 'next' on 2012-08-18)
403
+
404
The documentation in the TeXinfo format was using indented output
405
for materials meant to be examples that are better typeset in
406
monospace.
@@ -341,16 +408,15 @@ monospace.
408
Will merge to 'master' as part of the second batch.
409
410
* jc/maint-protect-sh-from-ifs (2012-08-08) 1 commit
344
- - sh-setup: protect from exported IFS
411
+ (merged to 'next' on 2012-08-20 at 8b00562)
412
+ + sh-setup: protect from exported IFS
413
414
When the user exports a non-default IFS without HT, scripts that
415
rely on being able to parse "ls-files -s | while read a b c..."
416
start to fail. Protect them from such a misconfiguration.
417
350
-Will merge to 'next'.
351
-
418
* jk/check-docs-update (2012-08-08) 8 commits
353
- (merged to 'next' on 2012-08-18 at 4409d2e)
419
+ (merged to 'next' on 2012-08-20 at d51021d)
420
+ check-docs: get documented command list from Makefile
421
+ check-docs: drop git-help special-case
422
+ check-docs: list git-gui as a command
@@ -360,14 +426,18 @@ Will merge to 'next'.
426
+ check-docs: update non-command documentation list
427
+ check-docs: mention gitweb specially
428
429
+(Originally merged to 'next' on 2012-08-18)
430
+
431
Simplify "make check-docs" implementation and update its coverage.
432
433
Will merge to 'master' as part of the first batch.
434
435
* js/gitweb-path-info-unquote (2012-08-15) 1 commit
368
- (merged to 'next' on 2012-08-15 at 844da17)
436
+ (merged to 'next' on 2012-08-20 at a4aa740)
437
+ gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
438
439
+(Originally merged to 'next' on 2012-08-15)
440
+
441
Stripping of PATH_INFO in gitweb did not take url style quoting into
442
account, failing to notice directories with funny characters e.g. SP
443
in their paths.
@@ -375,30 +445,27 @@ in their paths.
445
Will merge to 'master' as part of the first batch.
446
447
* mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit
378
- - rebase -i: use full onto sha1 in reflog
448
+ (merged to 'next' on 2012-08-20 at f671bd2)
449
+ + rebase -i: use full onto sha1 in reflog
450
451
The reflog entries left by "git rebase" and "git rebase -i" were
452
inconsistent.
453
383
-Will merge to 'next'.
384
-
454
* mz/empty-rebase-test (2012-08-09) 1 commit
386
- - add tests for 'git rebase --keep-empty'
387
-
388
-Will merge to 'next'.
455
+ (merged to 'next' on 2012-08-20 at 53e2419)
456
+ + add tests for 'git rebase --keep-empty'
457
458
* jc/capabilities (2012-08-13) 3 commits
391
- - fetch-pack: mention server version with verbose output
392
- - parse_feature_request: make it easier to see feature values
393
- - fetch-pack: do not ask for unadvertised capabilities
459
+ (merged to 'next' on 2012-08-20 at 1976e47)
460
+ + fetch-pack: mention server version with verbose output
461
+ + parse_feature_request: make it easier to see feature values
462
+ + fetch-pack: do not ask for unadvertised capabilities
463
(this branch uses jk/version-string.)
464
465
Some capabilities were asked by fetch-pack even when upload-pack did
466
not advertise that they are available. Fix fetch-pack not to do so.
467
399
-Will merge to 'next'.
400
-
401
-* pw/p4-use-client-spec-branch-detection (2012-08-11) 5 commits
468
+* pw/p4-use-client-spec-branch-detection (2012-08-20) 5 commits
469
- git p4: make branch detection work with --use-client-spec
470
- git p4: do wildcard decoding in stripRepoPath
471
- git p4: set self.branchPrefixes in initialization
@@ -415,13 +482,14 @@ Allows pushing and fetching refs/stash.
482
Need to send it out to the list for review.
483
484
* jk/version-string (2012-08-10) 3 commits
418
- (merged to 'next' on 2012-08-10 at d8dcb00)
485
+ (merged to 'next' on 2012-08-20 at 6d207bb)
486
+ do not send client agent unless server does first
487
+ send-pack: fix capability-sending logic
421
- (merged to 'next' on 2012-08-09 at 64dc91b)
488
+ include agent identifier in capability string
489
(this branch is used by jc/capabilities.)
490
491
+(Originally merged to 'next' on 2012-08-10)
492
+
493
Leftover bits from the "git version" code restructuring, that give
494
us an ability to expose the Git version over the wire in the
495
protocol exchange. But we do so carefully only to the other end that
@@ -430,62 +498,76 @@ understands it.
498
Will merge to 'master' as part of the third batch.
499
500
* js/grep-patterntype-config (2012-08-03) 1 commit
433
- (merged to 'next' on 2012-08-09 at 1a08d6c)
501
+ (merged to 'next' on 2012-08-20 at 39a0431)
502
+ grep: add a grep.patternType configuration setting
503
504
+(Originally merged to 'next' on 2012-08-09)
505
+
506
"grep" learned to use a non-standard pattern type by default if a
507
configuration variable tells it to.
508
509
Will merge to 'master' as part of the second batch.
510
511
* mm/die-with-dashdash-help (2012-08-03) 1 commit
442
- (merged to 'next' on 2012-08-09 at 1aae096)
512
+ (merged to 'next' on 2012-08-20 at ebe0e1a)
513
+ setup: clarify error messages for file/revisions ambiguity
514
515
+(Originally merged to 'next' on 2012-08-09)
516
+
517
Reword error messages.
518
519
Will merge to 'master' as part of the first batch.
520
521
* tr/merge-recursive-flush (2012-08-03) 1 commit
450
- (merged to 'next' on 2012-08-09 at da826ec)
522
+ (merged to 'next' on 2012-08-20 at 00aeb19)
523
+ merge-recursive: eliminate flush_buffer() in favor of write_in_full()
524
525
+(Originally merged to 'next' on 2012-08-09)
526
+
527
Remove unnecessary code.
528
529
Will merge to 'master' as part of the first batch.
530
531
* tr/void-diff-setup-done (2012-08-03) 1 commit
458
- (merged to 'next' on 2012-08-09 at 668a46f)
532
+ (merged to 'next' on 2012-08-20 at 2f21f63)
533
+ diff_setup_done(): return void
534
535
+(Originally merged to 'next' on 2012-08-09)
536
+
537
Remove unnecessary code.
538
539
Will merge to 'master' as part of the first batch.
540
541
* mk/test-seq (2012-08-04) 1 commit
466
- (merged to 'next' on 2012-08-06 at 3f6917c)
542
+ (merged to 'next' on 2012-08-20 at c373e0e)
543
+ tests: Introduce test_seq
544
(this branch is used by ab/diff-write-incomplete-line.)
545
546
+(Originally merged to 'next' on 2012-08-06)
547
+
548
Add a compatibility/utility function to the test framework.
549
550
Will merge to 'master' as part of the first batch.
551
552
* ab/diff-write-incomplete-line (2012-08-05) 1 commit
475
- (merged to 'next' on 2012-08-07 at dcf02ae)
553
+ (merged to 'next' on 2012-08-20 at e28b804)
554
+ Fix '\ No newline...' annotation in rewrite diffs
555
(this branch uses mk/test-seq.)
556
557
+(Originally merged to 'next' on 2012-08-07)
558
+
559
The output from "git diff -B" for a file that ends with an
560
incomplete line did not put "\ No newline..." on a line of its own.
561
562
Will merge to 'master' as part of the second batch.
563
564
* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit
485
- (merged to 'next' on 2012-08-05 at aa9f5e9)
565
+ (merged to 'next' on 2012-08-20 at 260975b)
566
+ apply: delete unused deflate_origlen from patch struct
567
488
-Remove unused field.
568
+(Originally merged to 'next' on 2012-08-05)
569
+
570
+Remove an unused field.
571
Will merge to 'master' as part of the first batch.
572
573
* tg/index-v5 (2012-08-17) 13 commits
@@ -507,9 +589,11 @@ A GSoC project, queued here primarily to give people an easier
589
access to the state of the last posted version.
590
591
* nd/index-errno (2012-08-06) 1 commit
510
- (merged to 'next' on 2012-08-06 at a9f2101)
592
+ (merged to 'next' on 2012-08-20 at 34076c6)
593
+ read_index_from: remove bogus errno assignments
594
595
+(Originally merged to 'next' on 2012-08-06)
596
+
597
Assignments to errno before calling system functions that used to
598
matter in the old code were left behind after the code structure
599
changed sufficiently to make them useless.
@@ -517,38 +601,33 @@ changed sufficiently to make them useless.
601
Will merge to 'master' as part of the first batch.
602
603
* jc/maint-sane-execvp-notdir (2012-07-31) 1 commit
520
- (merged to 'next' on 2012-08-09 at 5dd4240)
604
+ (merged to 'next' on 2012-08-20 at 0d76cf2)
605
+ sane_execvp(): ignore non-directory on $PATH
606
607
+(Originally merged to 'next' on 2012-08-09)
608
+
609
"git foo" errored out with "Not a directory" when the user had a non
610
directory on $PATH, and worse yet it masked an alias "foo" to run.
611
612
Will merge to 'master' as part of the third batch.
613
528
-* jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit
529
- (merged to 'next' on 2012-08-09 at 832c238)
530
- + macos: lazily initialize iconv
531
-
532
-Teach the code that works around NKD/NKC gotcha on MacOS to call
533
-iconv_open() only when it is necessary, in the hope of avoiding
534
-set-up overhead.
535
-
536
-Needs some work to rename functions
537
-as mentioned by Linus in the discussion.
538
-
614
* tr/maint-send-email-2047 (2012-07-31) 1 commit
540
- (merged to 'next' on 2012-08-09 at 17dfe57)
615
+ (merged to 'next' on 2012-08-20 at cf5ee1c)
616
+ send-email: improve RFC2047 quote parsing
617
618
+(Originally merged to 'next' on 2012-08-09)
619
+
620
"git send-email" did not unquote encoded words that appear on the
621
header correctly, and lost "_" from strings.
622
623
Will merge to 'master' as part of the first batch.
624
625
* cw/cherry-pick-allow-empty-message (2012-08-06) 1 commit
549
- (merged to 'next' on 2012-08-09 at eab95f6)
626
+ (merged to 'next' on 2012-08-20 at 0dc0590)
627
+ cherry-pick: add --allow-empty-message option
628
629
+(Originally merged to 'next' on 2012-08-09)
630
+
631
"git cherry-pick" by default stops when it sees a commit without any
632
log message. The "--allow-empty-message" option can be used to
633
silently proceed.
@@ -556,36 +635,39 @@ silently proceed.
635
Will merge to 'master' as part of the third batch.
636
637
* ms/git-svn-1.7 (2012-08-02) 20 commits
559
- - git-svn: remove ad-hoc canonicalizations
560
- - git-svn: canonicalize newly-minted URLs
561
- - git-svn: introduce add_path_to_url function
562
- - git-svn: canonicalize earlier
563
- - git-svn: replace URL escapes with canonicalization
564
- - git-svn: attempt to mimic SVN 1.7 URL canonicalization
565
- - t9107: fix typo
566
- - t9118: workaround inconsistency between SVN versions
567
- - Git::SVN{,::Ra}: canonicalize earlier
568
- - git-svn: path canonicalization uses SVN API
569
- - Git::SVN::Utils: remove irrelevant comment
570
- - git-svn: add join_paths() to safely concatenate paths
571
- - git-svn: factor out _collapse_dotdot function
572
- - git-svn: use SVN 1.7 to canonicalize when possible
573
- - git-svn: move canonicalization to Git::SVN::Utils
574
- - use Git::SVN{,::RA}->url accessor globally
575
- - use Git::SVN->path accessor globally
576
- - Git::SVN::Ra: use accessor for URLs
577
- - Git::SVN: use accessor for URLs internally
578
- - Git::SVN: use accessors internally for path
638
+ (merged to 'next' on 2012-08-21 at ae8aff9)
639
+ + git-svn: remove ad-hoc canonicalizations
640
+ + git-svn: canonicalize newly-minted URLs
641
+ + git-svn: introduce add_path_to_url function
642
+ + git-svn: canonicalize earlier
643
+ + git-svn: replace URL escapes with canonicalization
644
+ + git-svn: attempt to mimic SVN 1.7 URL canonicalization
645
+ + t9107: fix typo
646
+ + t9118: workaround inconsistency between SVN versions
647
+ + Git::SVN{,::Ra}: canonicalize earlier
648
+ + git-svn: path canonicalization uses SVN API
649
+ + Git::SVN::Utils: remove irrelevant comment
650
+ + git-svn: add join_paths() to safely concatenate paths
651
+ + git-svn: factor out _collapse_dotdot function
652
+ + git-svn: use SVN 1.7 to canonicalize when possible
653
+ + git-svn: move canonicalization to Git::SVN::Utils
654
+ + use Git::SVN{,::RA}->url accessor globally
655
+ + use Git::SVN->path accessor globally
656
+ + Git::SVN::Ra: use accessor for URLs
657
+ + Git::SVN: use accessor for URLs internally
658
+ + Git::SVN: use accessors internally for path
659
660
A series by Michael Schwern via Eric to update git-svn to revamp the
661
way URLs are internally passed around, to make it work with SVN 1.7.
662
583
-Will merge to 'next' after pinging Eric to double check and then to 'master'.
663
+Will merge to 'master' as part of the first batch.
664
665
* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit
586
- (merged to 'next' on 2012-07-30 at 9b27acc)
666
+ (merged to 'next' on 2012-08-20 at 3e2598a)
667
+ t7406: fix misleading "rev-parse --max-count=1 HEAD"
668
669
+(Originally merged to 'next' on 2012-07-30)
670
+
671
Test clean-up, with no behaviour change.
672
Will merge to 'master' as part of the second batch.
673
@@ -598,18 +680,19 @@ working tree and taking data from an object that happens to have
680
name 0{40} recorded in a tree.
681
682
* mz/cherry-code-cleanup (2012-07-29) 3 commits
601
- - cherry: remove redundant check for merge commit
602
- - cherry: don't set ignored rev_info options
603
- - remove unnecessary parameter from get_patch_ids()
683
+ (merged to 'next' on 2012-08-20 at bfb0457)
684
+ + cherry: remove redundant check for merge commit
685
+ + cherry: don't set ignored rev_info options
686
+ + remove unnecessary parameter from get_patch_ids()
687
688
Minor code clean-up on the cherry-pick codepath.
689
607
-Will merge to 'next'.
608
-
690
* jc/maint-config-exit-status (2012-07-30) 1 commit
610
- (merged to 'next' on 2012-07-30 at 8392da9)
691
+ (merged to 'next' on 2012-08-20 at e18ddd8)
692
+ config: "git config baa" should exit with status 1
693
694
+(Originally merged to 'next' on 2012-07-30)
695
+
696
The exit status code from "git config" was way overspecified while
697
being incorrect. Update the implementation to give the documented
698
status for a case that was documented, and introduce a new code for
@@ -618,27 +701,28 @@ status for a case that was documented, and introduce a new code for
701
Will merge to 'master' as part of the third batch.
702
703
* jk/maint-null-in-trees (2012-07-29) 2 commits
621
- (merged to 'next' on 2012-07-30 at 771c497)
704
+ (merged to 'next' on 2012-08-20 at 5bc2c49)
705
+ fsck: detect null sha1 in tree entries
706
+ do not write null sha1s to on-disk index
707
(this branch uses jk/maint-diff-nul40-as-sentinel.)
708
709
+(Originally merged to 'next' on 2012-07-30)
710
+
711
We do not want a link to 0{40} object stored anywhere in our objects.
712
713
Will merge to 'master' as part of the second batch.
714
715
* sz/submodule-force-update (2012-07-25) 1 commit
631
- (merged to 'next' on 2012-07-26 at 3bda2be)
632
- + Make 'git submodule update --force' always check out submodules.
716
+ - Make 'git submodule update --force' always check out submodules.
717
+
718
+We may want a documentation update and a few tests.
719
634
-We may want a documentation update and a few tests on top.
720
+Kicked back to 'pu'.
721
722
* jc/test-prereq (2012-08-04) 8 commits
637
- (merged to 'next' on 2012-08-04 at 6dd9156)
723
+ (merged to 'next' on 2012-08-20 at dd44c4a)
724
+ fixup! t3910: use the UTF8_NFD_TO_NFC test prereq
639
- (merged to 'next' on 2012-07-30 at b7c6949)
725
+ t3910: use the UTF8_NFD_TO_NFC test prereq
641
- (merged to 'next' on 2012-07-27 at 448cbbc)
726
+ test-lib: provide UTF8 behaviour as a prerequisite
727
+ t0050: use the SYMLINKS test prereq
728
+ t0050: use the CASE_INSENSITIVE_FS test prereq
@@ -646,43 +730,67 @@ We may want a documentation update and a few tests on top.
730
+ test: allow prerequisite to be evaluated lazily
731
+ test: rename $satisfied to $satisfied_prereq
732
733
+(Originally merged to 'next' on 2012-08-04)
734
+
735
Teaches the test framework to probe rarely used prerequistes lazily,
736
and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and
737
NKD/NKC MacOS x gotcha.
738
739
Will merge to 'master' as part of the first batch.
740
655
-* da/difftool-updates (2012-08-10) 12 commits
656
- (merged to 'next' on 2012-08-10 at 4accbf6)
741
+* da/difftool-updates (2012-08-21) 13 commits
742
+ (merged to 'next' on 2012-08-21 at 332afe4)
743
+ + difftool: silence warning
744
+ (merged to 'next' on 2012-08-20 at 2fecd90)
745
+ Add Code Compare v2.80.4 as a merge / diff tool for Windows
746
+ mergetool,difftool: Document --tool-help consistently
659
- (merged to 'next' on 2012-07-26 at 3263461)
747
+ difftool: Disable --symlinks on cygwin
748
+ difftool: Handle compare() returning -1
749
+ difftool: Wrap long lines for readability
750
+ difftool: Check all return codes from compare()
751
+ difftool: Handle finding mergetools/ in a path with spaces
665
- (merged to 'next' on 2012-07-23 at 96528a7)
752
+ difftool: Use symlinks when diffing against the worktree
753
+ difftool: Call the temp directory "git-difftool"
754
+ difftool: Move option values into a hash
755
+ difftool: Eliminate global variables
756
+ difftool: Simplify print_tool_help()
757
758
+(Originally merged to 'next' on 2012-08-10)
759
+
760
"git difftool --dir-diff" learned to use symbolic links to prepare
761
temporary copy of the working tree when available.
762
763
Will merge to 'master' as part of the second batch.
764
765
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
678
- (merged to 'next' on 2012-07-23 at fe59cb6)
679
- + pager: drop "wait for output to run less" hack
766
+ - pager: drop "wait for output to run less" hack
767
+
768
+(Originally merged to 'next' on 2012-07-23)
769
770
Will defer until the end of the 2012,
771
waiting for older "less" to go extinct.
772
773
* mm/push-default-switch-warning (2012-06-24) 1 commit
685
- (merged to 'next' on 2012-06-26 at fea512a)
774
+ (merged to 'next' on 2012-08-20 at 553e6c0)
775
+ push: start warning upcoming default change for push.default
776
777
+(Originally merged to 'next' on 2012-06-26)
778
+
779
+In the next major release, we will switch "git push [$there]" that
780
+does not say what to push from the traditional "matching" to the
781
+updated "simple" semantics, that pushes the current branch to the
782
+branch with the same name only when the current branch is set to
783
+integrate with that remote branch (all other cases will error out).
784
+
785
Will merge to 'master' as part of the second batch.
786
+
787
+--------------------------------------------------
788
+[Discarded]
789
+
790
+* jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit
791
+ . macos: lazily initialize iconv
792
+
793
+Teach the code that works around NKD/NKC gotcha on MacOS to call
794
+iconv_open() only when it is necessary, in the hope of avoiding
795
+set-up overhead. It turns out that there was no noticeable
796
+improvements.