What's cooking (2013/04 #05)
Junio C Hamano committed
Apr 15, 2013 at 13:27 UTC
5d8ff673337432c312af23fca11c3873ce47192f
1 file changed
+436
-307
whats-cooking.txt
+436
-307
@@ -1,21 +1,16 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2013, #04; Fri, 12)
4
-X-master-at: caa7d79f1f7c9940acfaf161b9b84bbf81980d95
5
-X-next-at: 8f252db48b97f196bce10b8bf2bd2bcf5b3a6ce3
3
+Subject: What's cooking in git.git (Apr 2013, #05; Mon, 15)
4
+X-master-at: aec3f77941205909f0671aa9767315a50e20ff87
5
+X-next-at: 7fdada62084c4fa855f6cf269a638ff1faea5ba2
6
7
-What's cooking in git.git (Apr 2013, #04; Fri, 12)
7
+What's cooking in git.git (Apr 2013, #05; Mon, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-A handful of topics that have been stalled for quite a while have
15
-been discarded; for those that are not superseded by something else,
16
-interested parties can still resubmit a reroll, but without any
17
-advances, we do not get any benefit from carrying them in my tree.
18
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
@@ -24,192 +19,262 @@ of the repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
27
-* po/help-guides (2013-04-03) 5 commits
28
- (merged to 'next' on 2013-04-04 at 3d99b28)
29
- + doc: include --guide option description for "git help"
30
- + help: mention -a and -g option, and 'git help <concept>' usage.
31
- + builtin/help.c: add list_common_guides_help() function
32
- + builtin/help.c: add --guide option
33
- + builtin/help.c: split "-a" processing into two
22
+* jk/diff-algo-finishing-touches (2013-04-05) 2 commits
23
+ (merged to 'next' on 2013-04-11 at af83b2b)
24
+ + diff: allow unstuck arguments with --diff-algorithm
25
+ + git-merge(1): document diff-algorithm option to merge-recursive
26
35
- "git help" learned "-g" option to show the list of guides just like
36
- list of commands are given with "-a".
27
+ "git diff --diff-algorithm algo" is also understood as "git diff
28
+ --diff-algorithm=algo".
29
30
39
-* ap/combine-diff-coalesce-lost (2013-03-25) 1 commit
40
- (merged to 'next' on 2013-03-29 at f6a05ca)
41
- + combine-diff: coalesce lost lines optimally
31
+* jk/diff-graph-submodule-summary (2013-04-05) 1 commit
32
+ (merged to 'next' on 2013-04-11 at 70dfa8d)
33
+ + submodule: print graph output next to submodule log
34
43
- Attempts to minimize "diff -c/--cc" output by coalescing the same
44
- lines removed from the parents better, but with an O(n^2)
45
- complexity.
35
+ Make "git diff --graph" work better with submodule log output.
36
37
48
-* js/rerere-forget-protect-against-NUL (2013-04-04) 2 commits
49
- (merged to 'next' on 2013-04-05 at 426d4e2)
50
- + rerere forget: do not segfault if not all stages are present
51
- + rerere forget: grok files containing NUL
38
+* jk/http-error-messages (2013-04-06) 9 commits
39
+ (merged to 'next' on 2013-04-11 at 7a03981)
40
+ + http: drop http_error function
41
+ + remote-curl: die directly with http error messages
42
+ + http: re-word http error message
43
+ + http: simplify http_error helper function
44
+ + remote-curl: consistently report repo url for http errors
45
+ + remote-curl: always show friendlier 404 message
46
+ + remote-curl: let servers override http 404 advice
47
+ + remote-curl: show server content on http errors
48
+ + http: add HTTP_KEEP_ERROR option
49
53
- A few bugfixes to "git rerere" working on corner case merge
54
- conflicts.
50
+ Improve error reporting from the http transfer clients.
51
52
57
-* sr/log-SG-no-textconv (2013-04-05) 6 commits
58
- (merged to 'next' on 2013-04-05 at 7f06945)
59
- + diffcore-pickaxe: unify code for log -S/-G
60
- + diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"
61
- + diffcore-pickaxe: port optimization from has_changes() to diff_grep()
62
- + diffcore-pickaxe: respect --no-textconv
63
- + diffcore-pickaxe: remove fill_one()
64
- + diffcore-pickaxe: remove unnecessary call to get_textconv()
53
+* jk/show-branch-strbuf (2013-04-06) 1 commit
54
+ (merged to 'next' on 2013-04-11 at 7a20aa5)
55
+ + show-branch: use strbuf instead of static buffer
56
66
- "git log -S/-G" started paying attention to textconv filter, but
67
- there was no way to disable this. Make it honor --no-textconv
68
- option.
57
+ "git show-branch" was not prepared to show a very long run of
58
+ ancestor operators e.g. foobar^2~2^2^2^2...^2~4 correctly.
59
70
---------------------------------------------------
71
-[New Topics]
60
73
-* po/help-guides (2013-04-12) 1 commit
74
- - help: mark common_guides[] as translatable
61
+* lf/bundle-with-tip-wo-message (2013-04-07) 1 commit
62
+ (merged to 'next' on 2013-04-11 at bb9f869)
63
+ + bundle: Accept prerequisites without commit messages
64
76
- Finishing touches.
77
- Will fast-track to 'master'.
65
+ "git bundle" did not like a bundle created using a commit without
66
+ any message as its one of the prerequistes.
67
68
80
-* ap/strbuf-humanize (2013-04-10) 2 commits
81
- - count-objects: add -H option to humanize sizes
82
- - strbuf: create strbuf_humanise_bytes() to show byte sizes
69
+* po/help-guides (2013-04-03) 5 commits
70
+ (merged to 'next' on 2013-04-04 at 3d99b28)
71
+ + doc: include --guide option description for "git help"
72
+ + help: mention -a and -g option, and 'git help <concept>' usage.
73
+ + builtin/help.c: add list_common_guides_help() function
74
+ + builtin/help.c: add --guide option
75
+ + builtin/help.c: split "-a" processing into two
76
84
- Teach "--human-readable" aka "-H" option to "git count-objects" to
85
- show various large numbers in Ki/Mi/GiB scaled as necessary.
77
+ "git help" learned "-g" option to show the list of guides just like
78
+ list of commands are given with "-a".
79
+ * po/help-guides (2013-04-12) 1 commit
80
+ - help: mark common_guides[] as translatable
81
87
- Will merge to 'next'.
82
+ Finishing touches.
83
89
- It may not be a bad idea to discard mc/count-objects-kibibytes,
90
- which can introduce regression to scripted users that expect the
91
- output to say "N kilobytes". Opinions?
84
85
+* rt/commentchar-fmt-merge-msg (2013-04-07) 2 commits
86
+ (merged to 'next' on 2013-04-11 at 6af638b)
87
+ + fmt-merge-msg: use core.commentchar in tag signatures completely
88
+ + fmt-merge-msg: respect core.commentchar in people credits
89
94
-* as/clone-reference-with-gitfile (2013-04-09) 2 commits
95
- - clone: Allow repo using gitfile as a reference
96
- - clone: Fix error message for reference repository
90
+ The new core.commentchar configuration was not applied to a few
91
+ places.
92
98
- "git clone" did not work if a repository pointed at by the
99
- "--reference" option is a gitfile that points at another place.
93
101
- Waiting for comments.
94
+* tr/perl-keep-stderr-open (2013-04-04) 2 commits
95
+ (merged to 'next' on 2013-04-07 at 04f737a)
96
+ + t9700: do not close STDERR
97
+ + perl: redirect stderr to /dev/null instead of closing
98
99
+ Closing (not redirecting to /dev/null) the standard error stream is
100
+ not a very smart thing to do. Later open may return file
101
+ descriptor #2 for unrelated purpose, and error reporting code may
102
+ write into them.
103
104
-* fc/transport-helper-error-reporting (2013-04-11) 3 commits
105
- - transport-helper: improve push messages
106
- - transport-helper: mention helper name when it dies
107
- - transport-helper: report errors properly
104
+--------------------------------------------------
105
+[New Topics]
106
109
- Rerolled enough times. In-code comments may want to be further
110
- extended to explain tricky parts, but seems to be ready otherwise.
107
+* kb/status-ignored-optim-2 (2013-04-15) 14 commits
108
+ . dir.c: git-status --ignored: don't scan the work tree twice
109
+ . dir.c: git-status --ignored: don't scan the work tree three times
110
+ . dir.c: git-status: avoid is_excluded checks for tracked files
111
+ . dir.c: replace is_path_excluded with now equivalent is_excluded API
112
+ . dir.c: unify is_excluded and is_path_excluded APIs
113
+ . dir.c: move prep_exclude
114
+ . dir.c: factor out parts of last_exclude_matching for later reuse
115
+ . dir.c: git-clean -d -X: don't delete tracked directories
116
+ . dir.c: make 'git-status --ignored' work within leading directories
117
+ . dir.c: git-status --ignored: don't list empty directories as ignored
118
+ . dir.c: git-ls-files --directories: don't hide empty directories
119
+ . dir.c: git-status --ignored: don't list empty ignored directories
120
+ . dir.c: git-status --ignored: don't list files in ignored directories
121
+ . dir.c: git-status --ignored: don't drop ignored directories
122
112
- Will merge to 'next'.
123
+ Rerolls kb/status-ignored-optim topic (reverted from 'next'). Not
124
+ merged to 'pu' as it heavily interferes with as/check-ignore topic.
125
126
115
-* jc/decorate (2013-04-07) 2 commits
116
- - decorate: add "clear_decoration()"
117
- - decorate: document API
118
- (this branch is used by jc/gg.)
127
+* fc/branch-upstream-color (2013-04-15) 1 commit
128
+ (merged to 'next' on 2013-04-15 at 2fc50fd)
129
+ + branch: colour upstream branches
130
120
- Will discard.
131
+ Add more colors to "git branch -vv" output.
132
133
+ Will merge to 'master'.
134
123
-* jc/gg (2013-04-08) 3 commits
124
- - commit: add get_commit_encoding()
125
- - commit: rename parse_commit_date()
126
- - commit: shrink "indegree" field
127
- (this branch uses jc/decorate.)
135
129
- Will discard.
136
+* jk/commit-info-slab (2013-04-13) 3 commits
137
+ - commit-slab: introduce a macro to define a slab for new type
138
+ - commit-slab: avoid large realloc
139
+ - commit: allow associating auxiliary info on-demand
140
141
+ Technology demonstration to show a way we could use unbound number
142
+ of flag bits on commit objects.
143
132
-* jk/doc-http-backend (2013-04-11) 2 commits
133
- - doc/http-backend: give some lighttpd config examples
134
- - doc/http-backend: clarify "half-auth" repo configuration
144
136
- Improve documentation to illustrate "push authenticated, fetch
137
- anonymous" configuration for smart HTTP servers.
145
+* jk/test-trash (2013-04-14) 2 commits
146
+ (merged to 'next' on 2013-04-15 at 15a6624)
147
+ + t/test-lib.sh: drop "$test" variable
148
+ + t/test-lib.sh: fix TRASH_DIRECTORY handling
149
139
- Will merge to 'next'.
150
+ Fix longstanding issues with the test harness when used with --root=<there>
151
+ option.
152
153
142
-* jk/gitweb-utf8 (2013-04-08) 4 commits
143
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
144
- - gitweb: Don't append ';js=(0|1)' to external links
145
- - gitweb: Make feed title valid utf8
146
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
154
+* lf/read-blob-data-from-index (2013-04-15) 3 commits
155
+ (merged to 'next' on 2013-04-15 at 09f92c6)
156
+ + convert.c: Remove duplicate code
157
+ + Add size parameter to read_blob_data_from_index_path()
158
+ + Add public function read_blob_data_from_index_path()
159
148
- Various fixes to gitweb.
149
-
150
- Waiting for a reroll after a review.
160
+ Reduce duplicated code between convert.c and attr.c.
161
162
+ Will merge to 'master'.
163
153
-* jk/submodule-subdirectory-ok (2013-04-10) 2 commits
154
- - submodule: drop the top-level requirement
155
- - rev-parse: add --prefix option
164
157
- Allow various subcommands of "git submodule" to be run not from the
158
- top of the working tree of the superproject.
165
+* mv/ssl-ftp-curl (2013-04-12) 1 commit
166
+ (merged to 'next' on 2013-04-15 at 7fdada6)
167
+ + Support FTP-over-SSL/TLS for regular FTP
168
160
- Waiting for comments.
169
+ Does anybody really use commit walkers over ftp???
170
171
+ Will merge to 'master'.
172
163
-* kb/co-orphan-suggestion-short-sha1 (2013-04-08) 1 commit
164
- - checkout: abbreviate hash in suggest_reattach
173
166
- Update the informational message when "git checkout" leaves the
167
- detached head state.
174
+* as/check-ignore (2013-04-11) 5 commits
175
+ - Documentation: add caveats about I/O buffering for check-{attr,ignore}
176
+ - check-ignore: allow incremental streaming of queries via --stdin
177
+ - check-ignore: move setup into cmd_check_ignore()
178
+ - check-ignore: add -n / --non-matching option
179
+ - t0008: remove duplicated test fixture data
180
+
181
+ Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
182
+ over bidi-pipes.
183
+
184
+
185
+* mh/packed-refs-various (2013-04-15) 33 commits
186
+ - refs: handle the main ref_cache specially
187
+ - refs: change do_for_each_*() functions to take ref_cache arguments
188
+ - pack_one_ref(): do some cheap tests before a more expensive one
189
+ - pack_one_ref(): use write_packed_entry() to do the writing
190
+ - pack_one_ref(): use function peel_entry()
191
+ - refs: inline function do_not_prune()
192
+ - pack_refs(): change to use do_for_each_entry()
193
+ - refs: use same lock_file object for both ref-packing functions
194
+ - pack_one_ref(): rename "path" parameter to "refname"
195
+ - pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
196
+ - pack-refs: rename handle_one_ref() to pack_one_ref()
197
+ - refs: extract a function write_packed_entry()
198
+ - repack_without_ref(): write peeled refs in the rewritten file
199
+ - t3211: demonstrate loss of peeled refs if a packed ref is deleted
200
+ - refs: change how packed refs are deleted
201
+ - search_ref_dir(): return an index rather than a pointer
202
+ - repack_without_ref(): silence errors for dangling packed refs
203
+ - t3210: test for spurious error messages for dangling packed refs
204
+ - refs: change the internal reference-iteration API
205
+ - refs: extract a function peel_entry()
206
+ - peel_ref(): fix return value for non-peelable, not-current reference
207
+ - peel_object(): give more specific information in return value
208
+ - refs: extract function peel_object()
209
+ - refs: extract a function ref_resolves_to_object()
210
+ - repack_without_ref(): use function get_packed_ref()
211
+ - peel_ref(): use function get_packed_ref()
212
+ - get_packed_ref(): return a ref_entry
213
+ - do_for_each_ref_in_dirs(): remove dead code
214
+ - refs: define constant PEELED_LINE_LENGTH
215
+ - refs: document how current_ref is used
216
+ - refs: document do_for_each_ref() and do_one_ref()
217
+ - refs: document the fields of struct ref_value
218
+ - refs: document flags constants REF_*
219
+
220
+ Updates reading and updating packed-refs file, correcting corner
221
+ case bugs.
222
+
223
+
224
+* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits
225
+ - transport-helper: add 'signed-tags' capability
226
+ - transport-helper: pass --signed-tags=warn-strip to fast-export
227
+ - fast-export: add --signed-tags=warn-strip mode
228
+
229
+ Allows remote-helpers to declare they can handle signed tags, and
230
+ issue a warning when using those that don't.
231
+
232
+ Comments?
233
+
234
+
235
+* jn/config-ignore-inaccessible (2013-04-15) 1 commit
236
+ - config: allow inaccessible configuration under $HOME
237
+
238
+ When $HOME is misconfigured to point at an unreadable directory, we
239
+ used to complain and die. This loosens the check.
240
+
241
+ I do not think we agreed that this is a good idea, though.
242
+
243
+
244
+* jn/gitweb-install-doc (2013-04-15) 1 commit
245
+ - gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
246
+
247
+ Reword gitweb configuration instrutions.
248
249
Will merge to 'next'.
250
251
172
-* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
173
- - cherry-pick: make sure all input objects are commits
252
+* jx/i18n-branch-error-messages (2013-04-15) 1 commit
253
+ - i18n: branch: mark strings for translation
254
175
- "git cherry-pick $blob $tree" is diagnosed as a nonsense.
255
+ Will merge to 'master'.
256
177
- Will merge to 'next'.
257
179
-* rs/empty-archive (2013-04-10) 1 commit
180
- - t5004: fix issue with empty archive test and bsdtar
258
+* nd/checkout-keep-sparse (2013-04-15) 1 commit
259
+ - checkout: add --ignore-skip-worktree-bits in sparse checkout mode
260
182
- Implementations of "tar" of BSD descend have found to have trouble
183
- with reading an otherwise empty tar archive with pax headers and
184
- causes an unnecessary test failure.
261
+ Make the initial "sparse" selection of the paths more sticky across
262
+ "git checkout".
263
264
Will merge to 'next'.
265
266
189
-* th/t9903-symlinked-workdir (2013-04-11) 1 commit
190
- - t9903: Don't fail when run from path accessed through symlink
267
+* ta/glossary (2013-04-15) 4 commits
268
+ - glossary: improve definitions of refspec and pathspec
269
+ - The name of the hash function is "SHA-1", not "SHA1"
270
+ - glossary: improve description of SHA-1 related topics
271
+ - glossary: remove outdated/misleading/irrelevant entries
272
273
Will merge to 'next'.
274
275
195
-* fc/completion (2013-04-12) 9 commits
196
- - completion: small optimization
197
- - completion: inline __gitcomp_1 to its sole callsite
198
- - completion: get rid of compgen
199
- - completion: add __gitcomp_nl tests
200
- - SQUASH??? avoid referencing undefined positional vars???
201
- - completion: add new __gitcompadd helper
202
- - completion: get rid of empty COMPREPLY assignments
203
- - completion: trivial test improvement
204
- - completion: add more cherry-pick options
205
-
206
- Looked mostly good.
207
-
208
- Will merge to 'next', after squashing the fix in.
209
-
210
-
211
-* jk/daemon-user-doc (2013-04-12) 1 commit
212
- - doc: clarify that "git daemon --user=<user>" option does not export HOME=~user
276
+* th/bisect-final-log (2013-04-15) 1 commit
277
+ - bisect: Store first bad commit as comment in log file
278
279
Will merge to 'next'.
280
@@ -251,61 +316,145 @@ of the repositories listed at
316
--------------------------------------------------
317
[Cooking]
318
254
-* fc/send-email-annotate (2013-04-07) 6 commits
255
- - format-patch: trivial cleanups
256
- - format-patch: add format.coverLetter configuration variable
257
- - log: update to OPT_BOOL
258
- - format-patch: refactor branch name calculation
259
- - format-patch: improve head calculation for cover-letter
260
- - send-email: make annotate configurable
319
+* ap/strbuf-humanize (2013-04-10) 2 commits
320
+ (merged to 'next' on 2013-04-14 at 66d7af5)
321
+ + count-objects: add -H option to humanize sizes
322
+ + strbuf: create strbuf_humanise_bytes() to show byte sizes
323
262
- Looked basically OK to me. Comments?
324
+ Teach "--human-readable" aka "-H" option to "git count-objects" to
325
+ show various large numbers in Ki/Mi/GiB scaled as necessary.
326
327
+ I've decided to let this topic supersede mc/count-objects-kibibytes.
328
+ Human users will get an even easier output with "-H" and by not
329
+ changing the output without an explicit option we do not have to
330
+ break third-party tools that may have been reading from the output
331
+ of this command.
332
265
-* jk/http-error-messages (2013-04-06) 9 commits
266
- (merged to 'next' on 2013-04-11 at 7a03981)
267
- + http: drop http_error function
268
- + remote-curl: die directly with http error messages
269
- + http: re-word http error message
270
- + http: simplify http_error helper function
271
- + remote-curl: consistently report repo url for http errors
272
- + remote-curl: always show friendlier 404 message
273
- + remote-curl: let servers override http 404 advice
274
- + remote-curl: show server content on http errors
275
- + http: add HTTP_KEEP_ERROR option
333
277
- Improve error reporting from the http transfer clients.
334
+* as/clone-reference-with-gitfile (2013-04-09) 2 commits
335
+ (merged to 'next' on 2013-04-15 at ab0d128)
336
+ + clone: Allow repo using gitfile as a reference
337
+ + clone: Fix error message for reference repository
338
+
339
+ "git clone" did not work if a repository pointed at by the
340
+ "--reference" option is a gitfile that points at another place.
341
+
342
+ Waiting for comments.
343
+
344
+
345
+* fc/transport-helper-error-reporting (2013-04-11) 3 commits
346
+ - transport-helper: improve push messages
347
+ - transport-helper: mention helper name when it dies
348
+ - transport-helper: report errors properly
349
+
350
+ Rerolled enough times. In-code comments may want to be further
351
+ extended to explain tricky parts, but seems to be ready otherwise.
352
+
353
+ Will merge to 'next'.
354
+
355
+
356
+* jk/doc-http-backend (2013-04-13) 3 commits
357
+ - doc/http-backend: match query-string in apache half-auth example
358
+ - doc/http-backend: give some lighttpd config examples
359
+ - doc/http-backend: clarify "half-auth" repo configuration
360
+
361
+ Improve documentation to illustrate "push authenticated, fetch
362
+ anonymous" configuration for smart HTTP servers.
363
+
364
+ Will merge to 'next'.
365
+
366
+
367
+* jk/gitweb-utf8 (2013-04-08) 4 commits
368
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
369
+ - gitweb: Don't append ';js=(0|1)' to external links
370
+ - gitweb: Make feed title valid utf8
371
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
372
+
373
+ Various fixes to gitweb.
374
+
375
+ Waiting for a reroll after a review.
376
+
377
+
378
+* jk/submodule-subdirectory-ok (2013-04-10) 2 commits
379
+ - submodule: drop the top-level requirement
380
+ - rev-parse: add --prefix option
381
+
382
+ Allow various subcommands of "git submodule" to be run not from the
383
+ top of the working tree of the superproject.
384
+
385
+ Waiting for comments.
386
+
387
+
388
+* kb/co-orphan-suggestion-short-sha1 (2013-04-08) 1 commit
389
+ (merged to 'next' on 2013-04-14 at 8caf7fd)
390
+ + checkout: abbreviate hash in suggest_reattach
391
+
392
+ Update the informational message when "git checkout" leaves the
393
+ detached head state.
394
395
Will merge to 'master'.
396
397
282
-* jk/show-branch-strbuf (2013-04-06) 1 commit
283
- (merged to 'next' on 2013-04-11 at 7a20aa5)
284
- + show-branch: use strbuf instead of static buffer
398
+* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
399
+ - cherry-pick: make sure all input objects are commits
400
286
- "git show-branch" was not prepared to show a very long run of
287
- ancestor operators e.g. foobar^2~2^2^2^2...^2~4 correctly.
401
+ "git cherry-pick $blob $tree" is diagnosed as a nonsense.
402
+
403
+ Will merge to 'next'.
404
+
405
+
406
+* rs/empty-archive (2013-04-10) 1 commit
407
+ (merged to 'next' on 2013-04-15 at eab39bc)
408
+ + t5004: fix issue with empty archive test and bsdtar
409
+
410
+ Implementations of "tar" of BSD descend have found to have trouble
411
+ with reading an otherwise empty tar archive with pax headers and
412
+ causes an unnecessary test failure.
413
414
Will merge to 'master'.
415
416
292
-* lf/bundle-with-tip-wo-message (2013-04-07) 1 commit
293
- (merged to 'next' on 2013-04-11 at bb9f869)
294
- + bundle: Accept prerequisites without commit messages
417
+* th/t9903-symlinked-workdir (2013-04-11) 1 commit
418
+ (merged to 'next' on 2013-04-15 at f062dc6)
419
+ + t9903: Don't fail when run from path accessed through symlink
420
+
421
+ Will merge to 'master'.
422
296
- "git bundle" did not like a bundle created using a commit without
297
- any message as its one of the prerequistes.
423
+
424
+* fc/completion (2013-04-14) 8 commits
425
+ (merged to 'next' on 2013-04-14 at a509746)
426
+ + completion: small optimization
427
+ + completion: inline __gitcomp_1 to its sole callsite
428
+ + completion: get rid of compgen
429
+ + completion: add __gitcomp_nl tests
430
+ + completion: add new __gitcompadd helper
431
+ + completion: get rid of empty COMPREPLY assignments
432
+ + completion: trivial test improvement
433
+ + completion: add more cherry-pick options
434
435
Will merge to 'master'.
436
437
302
-* rt/commentchar-fmt-merge-msg (2013-04-07) 2 commits
303
- (merged to 'next' on 2013-04-11 at 6af638b)
304
- + fmt-merge-msg: use core.commentchar in tag signatures completely
305
- + fmt-merge-msg: respect core.commentchar in people credits
438
+* jk/daemon-user-doc (2013-04-12) 1 commit
439
+ (merged to 'next' on 2013-04-14 at 56c08ff)
440
+ + doc: clarify that "git daemon --user=<user>" option does not export HOME=~user
441
307
- The new core.commentchar configuration was not applied to a few
308
- places.
442
+ Will merge to 'master'.
443
+
444
+
445
+* fc/send-email-annotate (2013-04-14) 7 commits
446
+ (merged to 'next' on 2013-04-14 at 4af1076)
447
+ + rebase-am: explicitly disable cover-letter
448
+ + format-patch: trivial cleanups
449
+ + format-patch: add format.coverLetter configuration variable
450
+ + log: update to OPT_BOOL
451
+ + format-patch: refactor branch name calculation
452
+ + format-patch: improve head calculation for cover-letter
453
+ + send-email: make annotate configurable
454
+
455
+ Allows format-patch --cover-letter to be configurable; the most
456
+ notable is the "auto" mode to create cover-letter only for multi
457
+ patch series.
458
459
Will merge to 'master'.
460
@@ -338,33 +487,15 @@ of the repositories listed at
487
Waiting for comments.
488
489
341
-* mc/count-objects-kibibytes (2013-04-03) 1 commit
342
- (merged to 'next' on 2013-04-05 at f4e50e8)
343
- + count-objects: output "KiB" instead of "kilobytes"
344
-
345
- The command reports the total diskspace used to store loose objects
346
- in kibibytes, but it was labelled as "kilobytes". The number now
347
- is shown with "KiB", e.g. "6750 objects, 50928 KiB".
348
-
349
- If you have scripts that decide when to run "git repack" by parsing
350
- the output from "git count-objects", this release may break them.
351
- Sorry about that. One of the scripts shipped by git-core itself
352
- also had to be adjusted. You may want to consider updating such
353
- scripts to always call "git gc --auto" to let it decide when to
354
- repack for you.
355
-
356
- Will merge to 'master'.
357
-
358
-
490
* jk/http-dumb-namespaces (2013-04-09) 1 commit
360
- - http-backend: respect GIT_NAMESPACE with dumb clients
491
+ (merged to 'next' on 2013-04-15 at 4bfa834)
492
+ + http-backend: respect GIT_NAMESPACE with dumb clients
493
494
Allow smart-capable HTTP servers to be restricted via the
495
GIT_NAMESPACE mechanism when talking with commit-walker clients
496
(they already do so when talking with smart HTTP clients).
497
366
- Will merge to 'next'.
367
-
498
+ Will merge to 'master'.
499
500
501
* jl/submodule-mv (2013-04-11) 4 commits
@@ -377,79 +508,24 @@ of the repositories listed at
508
inclusing relocating its working tree and adjusting the paths in
509
the .gitmodules file.
510
380
- Seems to break tests in 'pu' but it may be a mismerge with
381
- nd/magic-pathspecs topic.
382
-
383
-
384
-* tr/perl-keep-stderr-open (2013-04-04) 2 commits
385
- (merged to 'next' on 2013-04-07 at 04f737a)
386
- + t9700: do not close STDERR
387
- + perl: redirect stderr to /dev/null instead of closing
388
-
389
- Closing (not redirecting to /dev/null) the standard error stream is
390
- not a very smart thing to do. Later open may return file
391
- descriptor #2 for unrelated purpose, and error reporting code may
392
- write into them.
393
-
394
- Will merge to 'master'.
395
-
396
-
397
-* jc/detached-head-doc (2013-04-05) 1 commit
398
- - glossary: extend "detached HEAD" description
399
-
511
Will merge to 'next'.
512
513
403
-* jk/diff-algo-finishing-touches (2013-04-05) 2 commits
404
- (merged to 'next' on 2013-04-11 at af83b2b)
405
- + diff: allow unstuck arguments with --diff-algorithm
406
- + git-merge(1): document diff-algorithm option to merge-recursive
407
-
408
- "git diff --diff-algorithm algo" is also understood as "git diff
409
- --diff-algorithm=algo".
410
-
411
- Will merge to 'next'.
412
-
413
-
414
-* jk/diff-graph-submodule-summary (2013-04-05) 1 commit
415
- (merged to 'next' on 2013-04-11 at 70dfa8d)
416
- + submodule: print graph output next to submodule log
417
-
418
- Make "git diff --graph" work better with submodule log output.
514
+* jc/detached-head-doc (2013-04-05) 1 commit
515
+ (merged to 'next' on 2013-04-14 at 24b9271)
516
+ + glossary: extend "detached HEAD" description
517
420
- Will merge to 'next'.
518
+ Will merge to 'master'.
519
520
521
* jk/merge-tree-added-identically (2013-04-08) 1 commit
424
- - merge-tree: don't print entries that match "local"
522
+ (merged to 'next' on 2013-04-15 at 35fd4b9)
523
+ + merge-tree: don't print entries that match "local"
524
525
The resolution of some corner cases by "git merge-tree" were
526
inconsistent between top-of-the-tree and in a subdirectory.
527
429
- Will merge to 'next'.
430
-
431
-
432
-* kb/status-ignored-optim (2013-03-19) 8 commits
433
- (merged to 'next' on 2013-04-01 at 0c12ed9)
434
- + dir.c: git-status: avoid is_excluded checks for tracked files
435
- + dir.c: replace is_path_excluded with now equivalent is_excluded API
436
- + dir.c: unify is_excluded and is_path_excluded APIs
437
- + dir.c: move prep_exclude and factor out parts of last_exclude_matching
438
- + dir.c: git-status --ignored: don't list empty directories as ignored
439
- + dir.c: git-status --ignored: don't list empty ignored directories
440
- + dir.c: git-status --ignored: don't list files in ignored directories
441
- + dir.c: git-status --ignored: don't drop ignored directories
442
-
443
- "git status --ignored" had many corner case bugs. Also the command
444
- has been optimized by taking advantage of the fact that paths that
445
- are already known to the index do not have to be checked against
446
- the .gitignore mechanism most of the time.
447
-
448
- Will cook in 'next'.
449
-
450
- This codepath is used not only by status but also in add and clean,
451
- so a bug in it can result in lost data. Extra sets of eyeballs are
452
- very much appreciated.
528
+ Will merge to 'master'.
529
530
531
* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 6 commits
@@ -468,7 +544,7 @@ of the repositories listed at
544
transition hump with the earlier parts of this series, and flip the
545
default as the final step.
546
471
- Will cook in 'next' until Git 2.0.
547
+ Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0.
548
549
550
* tr/packed-object-info-wo-recursion (2013-03-27) 3 commits
@@ -480,60 +556,58 @@ of the repositories listed at
556
Attempts to reduce the stack footprint of sha1_object_info()
557
and unpack_entry() codepaths.
558
483
- Will cook in 'next'.
559
+ Will merge to 'master'.
560
561
562
* nd/magic-pathspecs (2013-03-31) 45 commits
487
- - Rename field "raw" to "_raw" in struct pathspec
488
- - pathspec: support :(glob) syntax
489
- - pathspec: make --literal-pathspecs disable pathspec magic
490
- - pathspec: support :(literal) syntax for noglob pathspec
491
- - Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
492
- - parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
493
- - parse_pathspec: make sure the prefix part is wildcard-free
494
- - tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
495
- - Remove match_pathspec() in favor of match_pathspec_depth()
496
- - Remove init_pathspec() in favor of parse_pathspec()
497
- - Remove diff_tree_{setup,release}_paths
498
- - Convert common_prefix() to use struct pathspec
499
- - Convert add_files_to_cache to take struct pathspec
500
- - Convert {read,fill}_directory to take struct pathspec
501
- - Convert refresh_index to take struct pathspec
502
- - Convert report_path_error to take struct pathspec
503
- - checkout: convert read_tree_some to take struct pathspec
504
- - Convert unmerge_cache to take struct pathspec
505
- - Convert run_add_interactive to use struct pathspec
506
- - Convert read_cache_preload() to take struct pathspec
507
- - reset: convert to use parse_pathspec
508
- - add: convert to use parse_pathspec
509
- - check-ignore: convert to use parse_pathspec
510
- - archive: convert to use parse_pathspec
511
- - ls-files: convert to use parse_pathspec
512
- - rm: convert to use parse_pathspec
513
- - checkout: convert to use parse_pathspec
514
- - rerere: convert to use parse_pathspec
515
- - status: convert to use parse_pathspec
516
- - commit: convert to use parse_pathspec
517
- - clean: convert to use parse_pathspec
518
- - Guard against new pathspec magic in pathspec matching code
519
- - parse_pathspec: support prefixing original patterns
520
- - parse_pathspec: support stripping/checking submodule paths
521
- - parse_pathspec: support stripping submodule trailing slashes
522
- - parse_pathspec: a special flag for max_depth feature
523
- - Convert some get_pathspec() calls to parse_pathspec()
524
- - parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
525
- - parse_pathspec: save original pathspec for reporting
526
- - Add parse_pathspec() that converts cmdline args to struct pathspec
527
- - pathspec: add copy_pathspec
528
- - pathspec: i18n-ize error strings in pathspec parsing code
529
- - Move struct pathspec and related functions to pathspec.[ch]
530
- - clean: remove unused variable "seen"
531
- - setup.c: check that the pathspec magic ends with ")"
563
+ . Rename field "raw" to "_raw" in struct pathspec
564
+ . pathspec: support :(glob) syntax
565
+ . pathspec: make --literal-pathspecs disable pathspec magic
566
+ . pathspec: support :(literal) syntax for noglob pathspec
567
+ . Kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
568
+ . parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
569
+ . parse_pathspec: make sure the prefix part is wildcard-free
570
+ . tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
571
+ . Remove match_pathspec() in favor of match_pathspec_depth()
572
+ . Remove init_pathspec() in favor of parse_pathspec()
573
+ . Remove diff_tree_{setup,release}_paths
574
+ . Convert common_prefix() to use struct pathspec
575
+ . Convert add_files_to_cache to take struct pathspec
576
+ . Convert {read,fill}_directory to take struct pathspec
577
+ . Convert refresh_index to take struct pathspec
578
+ . Convert report_path_error to take struct pathspec
579
+ . checkout: convert read_tree_some to take struct pathspec
580
+ . Convert unmerge_cache to take struct pathspec
581
+ . Convert run_add_interactive to use struct pathspec
582
+ . Convert read_cache_preload() to take struct pathspec
583
+ . reset: convert to use parse_pathspec
584
+ . add: convert to use parse_pathspec
585
+ . check-ignore: convert to use parse_pathspec
586
+ . archive: convert to use parse_pathspec
587
+ . ls-files: convert to use parse_pathspec
588
+ . rm: convert to use parse_pathspec
589
+ . checkout: convert to use parse_pathspec
590
+ . rerere: convert to use parse_pathspec
591
+ . status: convert to use parse_pathspec
592
+ . commit: convert to use parse_pathspec
593
+ . clean: convert to use parse_pathspec
594
+ . Guard against new pathspec magic in pathspec matching code
595
+ . parse_pathspec: support prefixing original patterns
596
+ . parse_pathspec: support stripping/checking submodule paths
597
+ . parse_pathspec: support stripping submodule trailing slashes
598
+ . parse_pathspec: a special flag for max_depth feature
599
+ . Convert some get_pathspec() calls to parse_pathspec()
600
+ . parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL}
601
+ . parse_pathspec: save original pathspec for reporting
602
+ . Add parse_pathspec() that converts cmdline args to struct pathspec
603
+ . pathspec: add copy_pathspec
604
+ . pathspec: i18n-ize error strings in pathspec parsing code
605
+ . Move struct pathspec and related functions to pathspec.[ch]
606
+ . clean: remove unused variable "seen"
607
+ . setup.c: check that the pathspec magic ends with ")"
608
609
Migrate the rest of codebase to use "struct pathspec" more.
610
535
- Will merge to 'next' after all the dust settles.
536
-
611
612
* jc/add-2.0-delete-default (2013-03-08) 3 commits
613
- git add <pathspec>... defaults to "-A"
@@ -555,14 +629,15 @@ of the repositories listed at
629
Start training the users for this change to say --no-all when they
630
want to ignore the removal to smooth the transition hump.
631
558
- Will cook in 'next' until Git 2.0.
632
+ Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0.
633
634
635
* tr/line-log (2013-04-12) 11 commits
562
- - log -L: improve comments in process_all_files()
563
- - log -L: store the path instead of a diff_filespec
564
- - log -L: test merge of parallel modify/rename
565
- - t4211: pass -M to 'git log -M -L...' test
636
+ (merged to 'next' on 2013-04-15 at 504559e)
637
+ + log -L: improve comments in process_all_files()
638
+ + log -L: store the path instead of a diff_filespec
639
+ + log -L: test merge of parallel modify/rename
640
+ + t4211: pass -M to 'git log -M -L...' test
641
(merged to 'next' on 2013-04-05 at 5afb00c)
642
+ log -L: fix overlapping input ranges
643
+ log -L: check range set invariants when we look it up
@@ -594,7 +669,7 @@ of the repositories listed at
669
forever be 'matching'. In Git 2.0, that will no longer be the
670
case.
671
597
- Will cook in 'next' until Git 2.0.
672
+ Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0.
673
674
--------------------------------------------------
675
[Discarded]
@@ -605,3 +680,57 @@ of the repositories listed at
680
. [EXPLAIN BETTER] run-command: add new check_command helper
681
682
fc/transport-helper-error-reporting supersedes this topic.
683
+
684
+
685
+* jc/gg (2013-04-08) 3 commits
686
+ . commit: add get_commit_encoding()
687
+ . commit: rename parse_commit_date()
688
+ . commit: shrink "indegree" field
689
+ (this branch uses jc/decorate.)
690
+
691
+
692
+* mc/count-objects-kibibytes (2013-04-14) 2 commits
693
+ (merged to 'next' on 2013-04-14 at ff03f2b)
694
+ + Revert "count-objects: output "KiB" instead of "kilobytes""
695
+ (merged to 'next' on 2013-04-05 at f4e50e8)
696
+ + count-objects: output "KiB" instead of "kilobytes"
697
+
698
+ The command reports the total diskspace used to store loose objects
699
+ in kibibytes, but it was labelled as "kilobytes". The number now
700
+ is shown with "KiB", e.g. "6750 objects, 50928 KiB".
701
+
702
+ If you have scripts that decide when to run "git repack" by parsing
703
+ the output from "git count-objects", this release may break them.
704
+ Sorry about that. One of the scripts shipped by git-core itself
705
+ also had to be adjusted. You may want to consider updating such
706
+ scripts to always call "git gc --auto" to let it decide when to
707
+ repack for you.
708
+
709
+ Discarded.
710
+
711
+
712
+* jc/decorate (2013-04-07) 2 commits
713
+ - decorate: add "clear_decoration()"
714
+ - decorate: document API
715
+ (this branch is used by jc/gg.)
716
+
717
+ Discarded.
718
+
719
+
720
+* kb/status-ignored-optim (2013-03-19) 8 commits
721
+ (merged to 'next' on 2013-04-01 at 0c12ed9)
722
+ + dir.c: git-status: avoid is_excluded checks for tracked files
723
+ + dir.c: replace is_path_excluded with now equivalent is_excluded API
724
+ + dir.c: unify is_excluded and is_path_excluded APIs
725
+ + dir.c: move prep_exclude and factor out parts of last_exclude_matching
726
+ + dir.c: git-status --ignored: don't list empty directories as ignored
727
+ + dir.c: git-status --ignored: don't list empty ignored directories
728
+ + dir.c: git-status --ignored: don't list files in ignored directories
729
+ + dir.c: git-status --ignored: don't drop ignored directories
730
+
731
+ "git status --ignored" had many corner case bugs. Also the command
732
+ has been optimized by taking advantage of the fact that paths that
733
+ are already known to the index do not have to be checked against
734
+ the .gitignore mechanism most of the time.
735
+
736
+ Discarded.