What's cooking (2012/08 #07)
Junio C Hamano committed
Aug 22, 2012 at 14:02 UTC
d42ae9cb87768dd71f358e3608f5c1e85811c9eb
1 file changed
+379
-349
whats-cooking.txt
+379
-349
@@ -1,15 +1,21 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2012, #06; Tue, 21)
4
-X-master-at: 889d35899ba64640e47798681ecb34a4be043bad
5
-X-next-at: 332afe444c0ae4d1fa700e16c4e23b42960792b4
3
+Subject: What's cooking in git.git (Aug 2012, #07; Wed, 22)
4
+X-master-at: 851f7e689efa034701bf41c3be06c927480eaae9
5
+X-next-at: ff27e03d9aa951d799461ff03a3f103000d7ce88
6
7
-What's cooking in git.git (Aug 2012, #06; Tue, 21)
7
+What's cooking in git.git (Aug 2012, #07; Wed, 22)
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
13
+As promised (threatened ;-), the first batch of topics for the next
14
+release are now part of 'master'. They are mostly innocuous
15
+documentation updates, test clean-ups, and all should eventually go
16
+to the maintenance track. The update to git-svn to make it work
17
+better with subversion 1.7 is also included.
18
+
19
I'm planning to keep this cycle reasonably short and aim for tagging
20
the result as 1.8.0 at the end of 9th week, on October 21st, after
21
which I'd disappear for a few weeks. http://tinyurl.com/gitCal is
@@ -23,101 +29,224 @@ repositories listed at
29
--------------------------------------------------
30
[New Topics]
31
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
32
+* er/doc-fast-import-done (2012-08-22) 1 commit
33
+ - fast-import: document the --done option
34
30
-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.
35
+Parked in 'pu' in case ESR responds with "Sorry, forgot to sign-off".
36
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
37
+* nd/am-i18n-fix (2012-08-22) 1 commit
38
+ - am: quote string for translation before passing to eval_gettextln
39
90
-A lot of i18n mark-up for the help text from "git <cmd> -h".
40
+"git am" wasn't marked up for i18n properly.
41
+Will merge to 'next', and eventually to maint-1.7.11 track.
42
92
-* tr/maint-parseopt-avoid-empty (2012-08-20) 1 commit
93
- - gettext: do not translate empty string
43
+--------------------------------------------------
44
+[Graduated to "master"]
45
95
-A workaround to avoid doing _(""), which translates to magic string
96
-in the .po files.
46
+* hv/coding-guidelines (2012-08-15) 1 commit
47
+ (merged to 'next' on 2012-08-20 at 4984865)
48
+ + Documentation/CodingGuidelines: spell out more shell guidelines
49
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
50
+(Originally merged to 'next' on 2012-08-18)
51
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.
52
+In earlier days, "imitate the style in the neibouring code" was
53
+sufficient to keep the coherent style, but over time some parts of
54
+the codebase have drifted enough to make it ineffective.
55
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
56
+* jc/doc-git-updates (2012-08-17) 1 commit
57
+ (merged to 'next' on 2012-08-20 at ab1db71)
58
+ + Documentation: update the introductory section
59
116
-Updates to tests that can be broken with gettext-poison builds.
60
+(Originally merged to 'next' on 2012-08-18)
61
+
62
+* jc/maint-abbrev-option-cli (2012-08-16) 1 commit
63
+ (merged to 'next' on 2012-08-20 at 54d1a5a)
64
+ + gitcli: describe abbreviation of long options
65
+
66
+(Originally merged to 'next' on 2012-08-18)
67
+
68
+We did not document that many commands take unique prefix
69
+abbreviations of long options (e.g. "--option" may be the only flag
70
+that the command accepts that begin with "--opt", in which case you
71
+can give "--opt") anywhere easy to find for new people.
72
+
73
+* jc/maint-rev-list-topo-doc (2012-08-15) 1 commit
74
+ (merged to 'next' on 2012-08-20 at 0f669d2)
75
+ + rev-list docs: clarify --topo-order description
76
+
77
+(Originally merged to 'next' on 2012-08-18)
78
+
79
+It was unclear what "--topo-order" was really about in the
80
+documentation. It is not just about "children before parent", but
81
+also about "don't mix lineages".
82
+
83
+* jc/tag-doc (2012-08-06) 1 commit
84
+ (merged to 'next' on 2012-08-20 at 9eb658e)
85
+ + Documentation: do not mention .git/refs/* directories
86
+
87
+(Originally merged to 'next' on 2012-08-18)
88
+
89
+Our documentation used to assume having files in .git/refs/*
90
+directories was the only to have branches and tags, but that is not
91
+true for quite some time.
92
+
93
+* jc/test-prereq (2012-08-04) 8 commits
94
+ (merged to 'next' on 2012-08-20 at dd44c4a)
95
+ + t3910: use the UTF8_NFD_TO_NFC test prereq
96
+ + test-lib: provide UTF8 behaviour as a prerequisite
97
+ + t0050: use the SYMLINKS test prereq
98
+ + t0050: use the CASE_INSENSITIVE_FS test prereq
99
+ + test-lib: provide case insensitivity as a prerequisite
100
+ + test: allow prerequisite to be evaluated lazily
101
+ + test: rename $satisfied to $satisfied_prereq
102
+
103
+(Originally merged to 'next' on 2012-08-04)
104
+
105
+Teaches the test framework to probe rarely used prerequistes lazily,
106
+and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and
107
+NKD/NKC MacOS x gotcha.
108
+
109
+* jk/check-docs-update (2012-08-08) 8 commits
110
+ (merged to 'next' on 2012-08-20 at d51021d)
111
+ + check-docs: get documented command list from Makefile
112
+ + check-docs: drop git-help special-case
113
+ + check-docs: list git-gui as a command
114
+ + check-docs: factor out command-list
115
+ + command-list: mention git-credential-* helpers
116
+ + command-list: add git-sh-i18n
117
+ + check-docs: update non-command documentation list
118
+ + check-docs: mention gitweb specially
119
+
120
+(Originally merged to 'next' on 2012-08-18)
121
+
122
+Simplify "make check-docs" implementation and update its coverage.
123
+
124
+* js/gitweb-path-info-unquote (2012-08-15) 1 commit
125
+ (merged to 'next' on 2012-08-20 at a4aa740)
126
+ + gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
127
+
128
+(Originally merged to 'next' on 2012-08-15)
129
+
130
+Stripping of PATH_INFO in gitweb did not take url style quoting into
131
+account, failing to notice directories with funny characters e.g. SP
132
+in their paths.
133
+
134
+* mk/test-seq (2012-08-04) 1 commit
135
+ (merged to 'next' on 2012-08-20 at c373e0e)
136
+ + tests: Introduce test_seq
137
+ (this branch is used by ab/diff-write-incomplete-line.)
138
+
139
+(Originally merged to 'next' on 2012-08-06)
140
+
141
+Add a compatibility/utility function to the test framework.
142
+
143
+* mm/die-with-dashdash-help (2012-08-03) 1 commit
144
+ (merged to 'next' on 2012-08-20 at ebe0e1a)
145
+ + setup: clarify error messages for file/revisions ambiguity
146
+
147
+(Originally merged to 'next' on 2012-08-09)
148
+
149
+Reword error messages.
150
+
151
+* ms/git-svn-1.7 (2012-08-02) 20 commits
152
+ (merged to 'next' on 2012-08-21 at ae8aff9)
153
+ + git-svn: remove ad-hoc canonicalizations
154
+ + git-svn: canonicalize newly-minted URLs
155
+ + git-svn: introduce add_path_to_url function
156
+ + git-svn: canonicalize earlier
157
+ + git-svn: replace URL escapes with canonicalization
158
+ + git-svn: attempt to mimic SVN 1.7 URL canonicalization
159
+ + t9107: fix typo
160
+ + t9118: workaround inconsistency between SVN versions
161
+ + Git::SVN{,::Ra}: canonicalize earlier
162
+ + git-svn: path canonicalization uses SVN API
163
+ + Git::SVN::Utils: remove irrelevant comment
164
+ + git-svn: add join_paths() to safely concatenate paths
165
+ + git-svn: factor out _collapse_dotdot function
166
+ + git-svn: use SVN 1.7 to canonicalize when possible
167
+ + git-svn: move canonicalization to Git::SVN::Utils
168
+ + use Git::SVN{,::RA}->url accessor globally
169
+ + use Git::SVN->path accessor globally
170
+ + Git::SVN::Ra: use accessor for URLs
171
+ + Git::SVN: use accessor for URLs internally
172
+ + Git::SVN: use accessors internally for path
173
+
174
+A series by Michael Schwern via Eric to update git-svn to revamp the
175
+way URLs are internally passed around, to make it work with SVN 1.7.
176
+
177
+* mv/pull-r-for-rebase (2012-08-17) 1 commit
178
+ (merged to 'next' on 2012-08-20 at 9743071)
179
+ + man: git pull -r is a short for --rebase
180
+
181
+(Originally merged to 'next' on 2012-08-18)
182
+
183
+A minor documentation update.
184
+
185
+* nd/index-errno (2012-08-06) 1 commit
186
+ (merged to 'next' on 2012-08-20 at 34076c6)
187
+ + read_index_from: remove bogus errno assignments
188
+
189
+(Originally merged to 'next' on 2012-08-06)
190
+
191
+Assignments to errno before calling system functions that used to
192
+matter in the old code were left behind after the code structure
193
+changed sufficiently to make them useless.
194
+
195
+* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit
196
+ (merged to 'next' on 2012-08-20 at 260975b)
197
+ + apply: delete unused deflate_origlen from patch struct
198
+
199
+(Originally merged to 'next' on 2012-08-05)
200
+
201
+Remove an unused field.
202
+
203
+* tr/maint-send-email-2047 (2012-07-31) 1 commit
204
+ (merged to 'next' on 2012-08-20 at cf5ee1c)
205
+ + send-email: improve RFC2047 quote parsing
206
+
207
+(Originally merged to 'next' on 2012-08-09)
208
+
209
+"git send-email" did not unquote encoded words that appear on the
210
+header correctly, and lost "_" from strings.
211
+
212
+* tr/merge-recursive-flush (2012-08-03) 1 commit
213
+ (merged to 'next' on 2012-08-20 at 00aeb19)
214
+ + merge-recursive: eliminate flush_buffer() in favor of write_in_full()
215
+
216
+(Originally merged to 'next' on 2012-08-09)
217
+
218
+Remove unnecessary code.
219
+
220
+* tr/void-diff-setup-done (2012-08-03) 1 commit
221
+ (merged to 'next' on 2012-08-20 at 2f21f63)
222
+ + diff_setup_done(): return void
223
+
224
+(Originally merged to 'next' on 2012-08-09)
225
+
226
+Remove unnecessary code.
227
228
--------------------------------------------------
229
[Stalled]
230
231
+* jc/add-delete-default (2012-08-13) 1 commit
232
+ - git add: notice removal of tracked paths by default
233
+
234
+"git add dir/" updated modified files and added new files, but does
235
+not notice removed files, which may be "Huh?" to some users. They
236
+can of course use "git add -A dir/", but why should they?
237
+
238
+Resurrected from graveyard, as I thought it was a worthwhile thing
239
+to do in the longer term; waiting for comments.
240
+
241
+* tx/relative-in-the-future (2012-08-16) 2 commits
242
+ - date: show relative dates in the future
243
+ - date: refactor the relative date logic from presentation
244
+
245
+Not my itch; rewritten an earlier submission by Tom Xue into
246
+somewhat more maintainable form, though it breaks existing i18n.
247
+
248
+Anybody interested in fixing it up? Otherwise may discard.
249
+
250
* pw/p4-submit-conflicts (2012-08-16) 12 commits
251
- git p4: add submit --prepare-p4-only option
252
- git p4: add submit --dry-run option
@@ -154,17 +283,6 @@ proper sign-offs.
283
284
Expecting a reroll.
285
157
-* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
158
- - commit/commit-tree: correct latin1 to utf-8
159
-
160
-Teaches "git commit" and "git commit-tree" the "we are told to use
161
-utf-8 in log message, but this does not look like utf-8---attempt to
162
-pass it through convert-from-latin1-to-utf8 and see if it makes
163
-sense" heuristics "git mailinfo" already uses.
164
-
165
-A draft from Linus received privately without a log message.
166
-Expecting a reroll.
167
-
286
* mb/remote-default-nn-origin (2012-07-11) 6 commits
287
- Teach get_default_remote to respect remote.default.
288
- Test that plain "git fetch" uses remote.default when on a detached HEAD.
@@ -178,6 +296,7 @@ often attempt to use 'origin'. This can now be customized via a
296
configuration variable.
297
298
Expecting a reroll.
299
+
300
"The first remote becomes the default" bit is better done as a
301
separate step.
302
@@ -214,17 +333,152 @@ working :-<.
333
--------------------------------------------------
334
[Cooking]
335
217
-* hv/coding-guidelines (2012-08-15) 1 commit
218
- (merged to 'next' on 2012-08-20 at 4984865)
219
- + Documentation/CodingGuidelines: spell out more shell guidelines
336
+* lt/commit-tree-guess-utf-8 (2012-08-21) 1 commit
337
+ - commit/commit-tree: correct latin1 to utf-8
338
+
339
+Teaches "git commit" and "git commit-tree" the "we are told to use
340
+utf-8 in log message, but this does not look like utf-8---attempt to
341
+pass it through convert-from-latin1-to-utf8 and see if it makes
342
+sense" heuristics "git mailinfo" already uses.
343
+
344
+Will merge to 'next'.
345
+
346
+* kk/maint-for-each-ref-multi-sort (2012-08-21) 2 commits
347
+ - for-each-ref: Fix sort with multiple keys
348
+ - t6300: test sort with multiple keys
349
+
350
+"git for-each-ref" did not currectly support more than one --sort
351
+option.
352
+
353
+Will merge to 'next'.
354
+
355
+* fa/remote-svn (2012-08-22) 16 commits
356
+ - Add a test script for remote-svn
357
+ - remote-svn: add marks-file regeneration
358
+ - Add a svnrdump-simulator replaying a dump file for testing
359
+ - remote-svn: add incremental import
360
+ - remote-svn: Activate import/export-marks for fast-import
361
+ - Create a note for every imported commit containing svn metadata
362
+ - vcs-svn: add fast_export_note to create notes
363
+ - Allow reading svn dumps from files via file:// urls
364
+ - remote-svn, vcs-svn: Enable fetching to private refs
365
+ - When debug==1, start fast-import with "--stats" instead of "--quiet"
366
+ - Add documentation for the 'bidi-import' capability of remote-helpers
367
+ - Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
368
+ - Add argv_array_detach and argv_array_free_detached
369
+ - Add svndump_init_fd to allow reading dumps from arbitrary FDs
370
+ - Add git-remote-testsvn to Makefile
371
+ - Implement a remote helper for svn in C
372
+ (this branch is used by fa/vcs-svn.)
373
+
374
+* fa/vcs-svn (2012-08-22) 4 commits
375
+ - vcs-svn: remove repo_tree
376
+ - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()
377
+ - vcs-svn/svndump: restructure node_ctx, rev_ctx handling
378
+ - svndump: move struct definitions to .h
379
+ (this branch uses fa/remote-svn.)
380
+
381
+* nd/i18n-parseopt-help (2012-08-22) 66 commits
382
+ - Use imperative form in help usage to describe an action
383
+ - Reduce translations by using same terminologies
384
+ - i18n: write-tree: mark parseopt strings for translation
385
+ - i18n: verify-tag: mark parseopt strings for translation
386
+ - i18n: verify-pack: mark parseopt strings for translation
387
+ - i18n: update-server-info: mark parseopt strings for translation
388
+ - i18n: update-ref: mark parseopt strings for translation
389
+ - i18n: update-index: mark parseopt strings for translation
390
+ - i18n: tag: mark parseopt strings for translation
391
+ - i18n: symbolic-ref: mark parseopt strings for translation
392
+ - i18n: show-ref: mark parseopt strings for translation
393
+ - i18n: show-branch: mark parseopt strings for translation
394
+ - i18n: shortlog: mark parseopt strings for translation
395
+ - i18n: rm: mark parseopt strings for translation
396
+ - i18n: revert, cherry-pick: mark parseopt strings for translation
397
+ - i18n: rev-parse: mark parseopt strings for translation
398
+ - i18n: reset: mark parseopt strings for translation
399
+ - i18n: rerere: mark parseopt strings for translation
400
+ - i18n: status: mark parseopt strings for translation
401
+ - i18n: replace: mark parseopt strings for translation
402
+ - i18n: remote: mark parseopt strings for translation
403
+ - i18n: read-tree: mark parseopt strings for translation
404
+ - i18n: push: mark parseopt strings for translation
405
+ - i18n: prune: mark parseopt strings for translation
406
+ - i18n: prune-packed: mark parseopt strings for translation
407
+ - i18n: pack-refs: mark parseopt strings for translation
408
+ - i18n: pack-objects: mark parseopt strings for translation
409
+ - i18n: notes: mark parseopt strings for translation
410
+ - i18n: name-rev: mark parseopt strings for translation
411
+ - i18n: mv: mark parseopt strings for translation
412
+ - i18n: mktree: mark parseopt strings for translation
413
+ - i18n: merge: mark parseopt strings for translation
414
+ - i18n: merge-file: mark parseopt strings for translation
415
+ - i18n: merge-base: mark parseopt strings for translation
416
+ - i18n: ls-tree: mark parseopt strings for translation
417
+ - i18n: ls-files: mark parseopt strings for translation
418
+ - i18n: log: mark parseopt strings for translation
419
+ - i18n: init-db: mark parseopt strings for translation
420
+ - i18n: help: mark parseopt strings for translation
421
+ - i18n: hash-object: mark parseopt strings for translation
422
+ - i18n: grep: mark parseopt strings for translation
423
+ - i18n: gc: mark parseopt strings for translation
424
+ - i18n: fsck: mark parseopt strings for translation
425
+ - i18n: format-patch: mark parseopt strings for translation
426
+ - i18n: for-each-ref: mark parseopt strings for translation
427
+ - i18n: fmt-merge-msg: mark parseopt strings for translation
428
+ - i18n: fetch: mark parseopt strings for translation
429
+ - i18n: fast-export: mark parseopt strings for translation
430
+ - i18n: describe: mark parseopt strings for translation
431
+ - i18n: config: mark parseopt strings for translation
432
+ - i18n: count-objects: mark parseopt strings for translation
433
+ - i18n: commit: mark parseopt strings for translation
434
+ - i18n: column: mark parseopt strings for translation
435
+ - i18n: clone: mark parseopt strings for translation
436
+ - i18n: clean: mark parseopt strings for translation
437
+ - i18n: cherry: mark parseopt strings for translation
438
+ - i18n: checkout: mark parseopt strings for translation
439
+ - i18n: checkout-index: mark parseopt strings for translation
440
+ - i18n: check-attr: mark parseopt strings for translation
441
+ - i18n: cat-file: mark parseopt strings for translation
442
+ - i18n: branch: mark parseopt strings for translation
443
+ - i18n: blame: mark parseopt strings for translation
444
+ - i18n: add: mark parseopt strings for translation
445
+ - i18n: bisect--helper: mark parseopt strings for translation
446
+ - i18n: archive: mark parseopt strings for translation
447
+ - i18n: mark "style" in OPT_COLUMN() for translation
448
+
449
+A lot of i18n mark-up for the help text from "git <cmd> -h".
450
+
451
+Will merge to 'next'.
452
+
453
+* tr/maint-parseopt-avoid-empty (2012-08-20) 1 commit
454
+ - gettext: do not translate empty string
455
+
456
+A workaround to avoid doing _(""), which translates to magic string
457
+in the .po files.
458
+
459
+Will merge to 'next'.
460
+
461
+* jk/config-warn-on-inaccessible-paths (2012-08-21) 4 commits
462
+ - warn_on_inaccessible(): a helper to warn on inaccessible paths
463
+ - attr: warn on inaccessible attribute files
464
+ - gitignore: report access errors of exclude files
465
+ - config: warn on inaccessible files
466
+
467
+When looking for $HOME/.gitconfig etc., it is OK if we cannot read
468
+them because they do not exist, but unable to read existing ones
469
+need to be diagnosed.
470
221
-(Originally merged to 'next' on 2012-08-18)
471
+Will merge to 'next'.
472
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.
473
+* nd/i18n-poison-test-updates (2012-08-21) 6 commits
474
+ - Fix tests under GETTEXT_POISON on parseopt
475
+ - Fix tests under GETTEXT_POISON on pack-object
476
+ - Fix tests under GETTEXT_POISON on git-apply
477
+ - Fix tests under GETTEXT_POISON on diffstat
478
+ - Fix tests under GETTEXT_POISON on git-stash
479
+ - Fix tests under GETTEXT_POISON on relative dates
480
227
-Will merge to 'master' as part of the first batch.
481
+Updates to tests that can be broken with gettext-poison builds.
482
483
* jc/daemon-access-hook (2012-08-15) 1 commit
484
(merged to 'next' on 2012-08-20 at c8f5b2e)
@@ -233,6 +487,8 @@ Will merge to 'master' as part of the first batch.
487
Allow an external command to tell git-daemon to decline service
488
based on the client address, repository path, etc.
489
490
+Will merge to 'master' as part of the third batch.
491
+
492
* jc/send-email-reconfirm (2012-08-14) 1 commit
493
(merged to 'next' on 2012-08-20 at dffdef6)
494
+ send-email: validate & reconfirm interactive responses
@@ -241,12 +497,7 @@ Validate interactive input to "git send-email" to avoid common
497
mistakes such as saying "y<RETURN>" to sender mail address whose
498
prompt is given with a correctly guessed default.
499
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
247
-
248
-Not my itch; rewritten an earlier submission by Tom Xue into
249
-somewhat more maintainable form, though it breaks existing i18n.
500
+Will merge to 'master' as part of the third batch.
501
502
* ef/win32-cred-helper (2012-08-16) 1 commit
503
(merged to 'next' on 2012-08-20 at bd5c651)
@@ -255,28 +506,7 @@ somewhat more maintainable form, though it breaks existing i18n.
506
Credential helper for Win32 to allow access to the keychain of
507
the logged-in user.
508
258
-* jc/maint-abbrev-option-cli (2012-08-16) 1 commit
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
267
-can give "--opt") anywhere easy to find for new people.
268
-
269
-Will merge to 'master' as part of the first batch.
270
-
271
-* mv/pull-r-for-rebase (2012-08-17) 1 commit
272
- (merged to 'next' on 2012-08-20 at 9743071)
273
- + man: git pull -r is a short for --rebase
274
-
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.
509
+Will merge to 'master' as part of the second batch.
510
511
* rr/precompose-utf8-cleanup (2012-08-20) 2 commits
512
(merged to 'next' on 2012-08-20 at a883c2a)
@@ -285,41 +515,7 @@ Will merge to 'master' as part of the first batch.
515
516
A style and code cleanup.
517
288
-* jc/doc-git-updates (2012-08-17) 1 commit
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
-
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
300
- - remote-svn: add incremental import
301
- - remote-svn: Activate import/export-marks for fast-import
302
- - Create a note for every imported commit containing svn metadata
303
- - vcs-svn: add fast_export_note to create notes
304
- - Allow reading svn dumps from files via file:// urls
305
- - remote-svn, vcs-svn: Enable fetching to private refs
306
- - When debug==1, start fast-import with "--stats" instead of "--quiet"
307
- - Add documentation for the 'bidi-import' capability of remote-helpers
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
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
-
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
320
- (this branch uses fa/remote-svn.)
321
-
322
-Rerolled with another round of fix-up squashed in.
518
+Will merge to 'master' as part of the second batch.
519
520
* mh/maint-config-doc-proxy-command (2012-08-18) 2 commits
521
(merged to 'next' on 2012-08-20 at a484625)
@@ -328,6 +524,8 @@ Rerolled with another round of fix-up squashed in.
524
525
A minor documentation update.
526
527
+Will merge to 'master' as part of the second batch.
528
+
529
* ph/stash-rerere (2012-08-17) 2 commits
530
(merged to 'next' on 2012-08-20 at ae37111)
531
+ stash: invoke rerere in case of conflict
@@ -336,33 +534,15 @@ A minor documentation update.
534
"git stash" internally used "git merge-recursive" backend, which did
535
not trigger "rerere" upon conflicts unlike other mergy operations.
536
537
+Will merge to 'master' as part of the third batch.
538
+
539
* hv/submodule-path-unmatch (2012-08-14) 1 commit
540
(merged to 'next' on 2012-08-20 at cbe6483)
541
+ Let submodule command exit with error status if path does not exist
542
543
As the title says.
544
345
-* jc/add-delete-default (2012-08-13) 1 commit
346
- - git add: notice removal of tracked paths by default
347
-
348
-"git add dir/" updated modified files and added new files, but does
349
-not notice removed files, which may be "Huh?" to some users. They
350
-can of course use "git add -A dir/", but why should they?
351
-
352
-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
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".
364
-
365
-Will merge to 'master' as part of the first batch.
545
+Will merge to 'master' as part of the second batch.
546
547
* bc/receive-pack-stdout-protection (2012-08-06) 2 commits
548
(merged to 'next' on 2012-08-20 at b1b0d18)
@@ -383,17 +563,7 @@ Will merge to 'master' as part of the second batch.
563
564
Teach "git prune" without "-v" to be silent about leftover temporary files.
565
386
-* jc/tag-doc (2012-08-06) 1 commit
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.
395
-
396
-Will merge to 'master' as part of the first batch.
566
+Will merge to 'master' as part of the second batch.
567
568
* jk/docs-docbook-monospace-display (2012-08-07) 1 commit
569
(merged to 'next' on 2012-08-20 at 0ed30dc)
@@ -415,34 +585,7 @@ When the user exports a non-default IFS without HT, scripts that
585
rely on being able to parse "ls-files -s | while read a b c..."
586
start to fail. Protect them from such a misconfiguration.
587
418
-* jk/check-docs-update (2012-08-08) 8 commits
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
423
- + check-docs: factor out command-list
424
- + command-list: mention git-credential-* helpers
425
- + command-list: add git-sh-i18n
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
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.
444
-
445
-Will merge to 'master' as part of the first batch.
588
+Will merge to 'master' as part of the second batch.
589
590
* mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit
591
(merged to 'next' on 2012-08-20 at f671bd2)
@@ -451,10 +594,14 @@ Will merge to 'master' as part of the first batch.
594
The reflog entries left by "git rebase" and "git rebase -i" were
595
inconsistent.
596
597
+Will merge to 'master' as part of the second batch.
598
+
599
* mz/empty-rebase-test (2012-08-09) 1 commit
600
(merged to 'next' on 2012-08-20 at 53e2419)
601
+ add tests for 'git rebase --keep-empty'
602
603
+Will merge to 'master' as part of the second batch.
604
+
605
* jc/capabilities (2012-08-13) 3 commits
606
(merged to 'next' on 2012-08-20 at 1976e47)
607
+ fetch-pack: mention server version with verbose output
@@ -465,6 +612,8 @@ inconsistent.
612
Some capabilities were asked by fetch-pack even when upload-pack did
613
not advertise that they are available. Fix fetch-pack not to do so.
614
615
+Will merge to 'master' as part of the second batch.
616
+
617
* pw/p4-use-client-spec-branch-detection (2012-08-20) 5 commits
618
- git p4: make branch detection work with --use-client-spec
619
- git p4: do wildcard decoding in stripRepoPath
@@ -508,51 +657,9 @@ configuration variable tells it to.
657
658
Will merge to 'master' as part of the second batch.
659
511
-* mm/die-with-dashdash-help (2012-08-03) 1 commit
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
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
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
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
-
660
* ab/diff-write-incomplete-line (2012-08-05) 1 commit
661
(merged to 'next' on 2012-08-20 at e28b804)
662
+ Fix '\ No newline...' annotation in rewrite diffs
555
- (this branch uses mk/test-seq.)
663
664
(Originally merged to 'next' on 2012-08-07)
665
@@ -561,15 +668,6 @@ incomplete line did not put "\ No newline..." on a line of its own.
668
669
Will merge to 'master' as part of the second batch.
670
564
-* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit
565
- (merged to 'next' on 2012-08-20 at 260975b)
566
- + apply: delete unused deflate_origlen from patch struct
567
-
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
-
671
* tg/index-v5 (2012-08-17) 13 commits
672
- p0002-index.sh: add perf test for the index formats
673
- update-index.c: rewrite index when index-version is given
@@ -588,18 +686,6 @@ Will merge to 'master' as part of the first batch.
686
A GSoC project, queued here primarily to give people an easier
687
access to the state of the last posted version.
688
591
-* nd/index-errno (2012-08-06) 1 commit
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.
600
-
601
-Will merge to 'master' as part of the first batch.
602
-
689
* jc/maint-sane-execvp-notdir (2012-07-31) 1 commit
690
(merged to 'next' on 2012-08-20 at 0d76cf2)
691
+ sane_execvp(): ignore non-directory on $PATH
@@ -611,17 +697,6 @@ directory on $PATH, and worse yet it masked an alias "foo" to run.
697
698
Will merge to 'master' as part of the third batch.
699
614
-* tr/maint-send-email-2047 (2012-07-31) 1 commit
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
-
700
* cw/cherry-pick-allow-empty-message (2012-08-06) 1 commit
701
(merged to 'next' on 2012-08-20 at 0dc0590)
702
+ cherry-pick: add --allow-empty-message option
@@ -634,34 +709,6 @@ silently proceed.
709
710
Will merge to 'master' as part of the third batch.
711
637
-* ms/git-svn-1.7 (2012-08-02) 20 commits
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
-
663
-Will merge to 'master' as part of the first batch.
664
-
712
* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit
713
(merged to 'next' on 2012-08-20 at 3e2598a)
714
+ t7406: fix misleading "rev-parse --max-count=1 HEAD"
@@ -687,6 +734,8 @@ name 0{40} recorded in a tree.
734
735
Minor code clean-up on the cherry-pick codepath.
736
737
+Will merge to 'master' as part of the second batch.
738
+
739
* jc/maint-config-exit-status (2012-07-30) 1 commit
740
(merged to 'next' on 2012-08-20 at e18ddd8)
741
+ config: "git config baa" should exit with status 1
@@ -719,25 +768,6 @@ We may want a documentation update and a few tests.
768
769
Kicked back to 'pu'.
770
722
-* jc/test-prereq (2012-08-04) 8 commits
723
- (merged to 'next' on 2012-08-20 at dd44c4a)
724
- + fixup! t3910: use the UTF8_NFD_TO_NFC test prereq
725
- + t3910: use the UTF8_NFD_TO_NFC test prereq
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
729
- + test-lib: provide case insensitivity as a prerequisite
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
-
771
* da/difftool-updates (2012-08-21) 13 commits
772
(merged to 'next' on 2012-08-21 at 332afe4)
773
+ difftool: silence warning