What's cooking (2013/04 #04)
Junio C Hamano committed
Apr 12, 2013 at 14:31 UTC
7c63c98dc70f23108b0948ab9526b8ce48c0bc64
1 file changed
+280
-196
whats-cooking.txt
+280
-196
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2013, #03; Sun, 7)
4
-X-master-at: 52a3e011c779456e63b6274af0024eeb92dd7888
5
-X-next-at: b213c0d2377aff930c500c0ac0d580a34e76686d
3
+Subject: What's cooking in git.git (Apr 2013, #04; Fri, 12)
4
+X-master-at: caa7d79f1f7c9940acfaf161b9b84bbf81980d95
5
+X-next-at: 8f252db48b97f196bce10b8bf2bd2bcf5b3a6ce3
6
7
-What's cooking in git.git (Apr 2013, #03; Sun, 7)
7
+What's cooking in git.git (Apr 2013, #04; Fri, 12)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -24,140 +24,218 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
27
-* cn/commit-amend-doc (2013-04-05) 1 commit
28
- (merged to 'next' on 2013-04-05 at 4c42e59)
29
- + Documentation/git-commit: reword the --amend explanation
30
- (this branch is used by jc/detached-head-doc.)
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
34
35
+ "git help" learned "-g" option to show the list of guides just like
36
+ list of commands are given with "-a".
37
33
-* fc/remote-helpers-test-updates (2013-04-04) 4 commits
34
- (merged to 'next' on 2013-04-04 at 0612744)
35
- + remote-hg: fix hg-git test-case
36
- + remote-bzr: remove stale check code for tests
37
- + remote-helpers: fix the run of all tests
38
- + remote-bzr: avoid echo -n
39
- (this branch is used by fc/transport-helper-waitpid.)
38
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
42
42
-* jk/bisect-prn-unsigned (2013-04-03) 1 commit
43
- (merged to 'next' on 2013-04-04 at 2c4df36)
44
- + bisect: avoid signed integer overflow
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.
46
47
47
-* jk/diffcore-break-divzero (2013-04-03) 1 commit
48
- (merged to 'next' on 2013-04-04 at b7632e0)
49
- + diffcore-break: don't divide by zero
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
52
53
+ A few bugfixes to "git rerere" working on corner case merge
54
+ conflicts.
55
52
-* jk/filter-branch-come-back-to-original (2013-04-02) 1 commit
53
- (merged to 'next' on 2013-04-04 at 621684a)
54
- + filter-branch: return to original dir after filtering
56
56
- When used with "-d temporary-directory" option, "git filter-branch"
57
- failed to come back to the original working tree to perform the
58
- final clean-up procedure.
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()
65
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.
69
61
-* jk/rm-removed-paths (2013-04-04) 3 commits
62
- (merged to 'next' on 2013-04-05 at ce9a926)
63
- + t3600: document failure of rm across symbolic links
64
- + t3600: test behavior of reverse-d/f conflict
65
- + rm: do not complain about d/f conflicts during deletion
70
+--------------------------------------------------
71
+[New Topics]
72
67
- A handful of test cases and a corner case bugfix for "git rm".
73
+* po/help-guides (2013-04-12) 1 commit
74
+ - help: mark common_guides[] as translatable
75
76
+ Finishing touches.
77
+ Will fast-track to 'master'.
78
70
-* jk/set-upstream-error-cases (2013-04-02) 5 commits
71
- (merged to 'next' on 2013-04-04 at b58c26b)
72
- + branch: give advice when tracking start-point is missing
73
- + branch: mention start_name in set-upstream error messages
74
- + branch: improve error message for missing --set-upstream-to ref
75
- + branch: factor out "upstream is not a branch" error messages
76
- + t3200: test --set-upstream-to with bogus refs
79
78
- The handing by "git branch --set-upstream-to" against various forms
79
- of errorneous inputs was suboptimal and has been improved.
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
83
84
+ Teach "--human-readable" aka "-H" option to "git count-objects" to
85
+ show various large numbers in Ki/Mi/GiB scaled as necessary.
86
82
-* mg/texinfo-5 (2013-04-03) 1 commit
83
- (merged to 'next' on 2013-04-04 at bd84440)
84
- + Documentation: Strip texinfo anchors to avoid duplicates
87
+ Will merge to 'next'.
88
86
- Strip @anchor elements in the texinfo output of the documentation,
87
- as a single document created by concatenating our entire manual set
88
- will produce many duplicates that makes newer texinfo unhappy.
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?
92
93
91
-* mm/status-during-revert (2013-04-02) 2 commits
92
- (merged to 'next' on 2013-04-04 at 1282528)
93
- + status: show commit sha1 in "You are currently reverting" message
94
- + status: show 'revert' state and status hint
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
97
96
- "git status" learned to report that you are in the middle of a
97
- revert session, just like it does for a cherry-pick and a bisect
98
- session.
98
+ "git clone" did not work if a repository pointed at by the
99
+ "--reference" option is a gitfile that points at another place.
100
101
+ Waiting for comments.
102
101
-* rr/triangle (2013-04-02) 6 commits
102
- (merged to 'next' on 2013-04-04 at 2d2c8ee)
103
- + remote.c: introduce branch.<name>.pushremote
104
- + remote.c: introduce remote.pushdefault
105
- + remote.c: introduce a way to have different remotes for fetch/push
106
- + t5516 (fetch-push): drop implicit arguments from helper functions
107
- + t5516 (fetch-push): update test description
108
- + remote.c: simplify a bit of code using git_config_string()
103
110
- Support "pull from one place, push to another place" workflow
111
- better by introducing remote.pushdefault (overrides the "origin"
112
- thing) and branch.*.pushremote (overrides the branch.*.remote).
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
108
109
+ Rerolled enough times. In-code comments may want to be further
110
+ extended to explain tricky parts, but seems to be ready otherwise.
111
115
-* tb/shared-perm (2013-04-05) 2 commits
116
- (merged to 'next' on 2013-04-05 at 2481155)
117
- + path.c: optimize adjust_shared_perm()
118
- + path.c: simplify adjust_shared_perm()
112
+ Will merge to 'next'.
113
120
- Simplifies adjust_shared_perm() implementation.
114
122
---------------------------------------------------
123
-[New Topics]
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.)
119
125
-* fc/send-email-annotate (2013-04-07) 6 commits
126
- - format-patch: trivial cleanups
127
- - format-patch: add format.coverLetter configuration variable
128
- - log: update to OPT_BOOL
129
- - format-patch: refactor branch name calculation
130
- - format-patch: improve head calculation for cover-letter
131
- - send-email: make annotate configurable
120
+ Will discard.
121
122
134
-* jk/http-error-messages (2013-04-06) 9 commits
135
- - http: drop http_error function
136
- - remote-curl: die directly with http error messages
137
- - http: re-word http error message
138
- - http: simplify http_error helper function
139
- - remote-curl: consistently report repo url for http errors
140
- - remote-curl: always show friendlier 404 message
141
- - remote-curl: let servers override http 404 advice
142
- - remote-curl: show server content on http errors
143
- - http: add HTTP_KEEP_ERROR option
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.)
128
129
+ Will discard.
130
146
-* jk/show-branch-strbuf (2013-04-06) 1 commit
147
- - show-branch: use strbuf instead of static buffer
131
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
135
150
-* lf/bundle-with-tip-wo-message (2013-04-07) 1 commit
151
- - bundle: Accept prerequisites without commit messages
136
+ Improve documentation to illustrate "push authenticated, fetch
137
+ anonymous" configuration for smart HTTP servers.
138
139
+ Will merge to 'next'.
140
154
-* rt/commentchar-fmt-merge-msg (2013-04-07) 2 commits
155
- - fmt-merge-msg: use core.commentchar in tag signatures completely
156
- - fmt-merge-msg: respect core.commentchar in people credits
141
+
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
147
+
148
+ Various fixes to gitweb.
149
+
150
+ Waiting for a reroll after a review.
151
+
152
+
153
+* jk/submodule-subdirectory-ok (2013-04-10) 2 commits
154
+ - submodule: drop the top-level requirement
155
+ - rev-parse: add --prefix option
156
+
157
+ Allow various subcommands of "git submodule" to be run not from the
158
+ top of the working tree of the superproject.
159
+
160
+ Waiting for comments.
161
+
162
+
163
+* kb/co-orphan-suggestion-short-sha1 (2013-04-08) 1 commit
164
+ - checkout: abbreviate hash in suggest_reattach
165
+
166
+ Update the informational message when "git checkout" leaves the
167
+ detached head state.
168
+
169
+ Will merge to 'next'.
170
+
171
+
172
+* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
173
+ - cherry-pick: make sure all input objects are commits
174
+
175
+ "git cherry-pick $blob $tree" is diagnosed as a nonsense.
176
+
177
+ Will merge to 'next'.
178
+
179
+* rs/empty-archive (2013-04-10) 1 commit
180
+ - t5004: fix issue with empty archive test and bsdtar
181
+
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.
185
+
186
+ Will merge to 'next'.
187
+
188
+
189
+* th/t9903-symlinked-workdir (2013-04-11) 1 commit
190
+ - t9903: Don't fail when run from path accessed through symlink
191
+
192
+ Will merge to 'next'.
193
+
194
+
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
213
+
214
+ Will merge to 'next'.
215
216
--------------------------------------------------
217
[Stalled]
218
219
+* nd/pretty-formats (2013-04-01) 12 commits
220
+ - pretty: support %>> that steal trailing spaces
221
+ - pretty: support truncating in %>, %< and %><
222
+ - pretty: support padding placeholders, %< %> and %><
223
+ - pretty: add %C(auto) for auto-coloring on the next placeholder
224
+ - pretty: two phase conversion for non utf-8 commits
225
+ - utf8: keep NULs in reencode_string()
226
+ - pretty: get the correct encoding for --pretty:format=%e
227
+ - pretty: save commit encoding from logmsg_reencode if the caller needs it
228
+ - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
229
+ - utf8.c: move display_mode_esc_sequence_len() for use by other functions
230
+ - pretty: share code between format_decoration and show_decorations
231
+ - pretty-formats.txt: wrap long lines
232
+
233
+ A mixed bag of a bugfix and two fun enhancements on pretty formats
234
+ placeholder.
235
+
236
+ Expecting a reroll.
237
+
238
+
239
* jc/format-patch (2013-02-21) 2 commits
240
- format-patch: --inline-single
241
- format-patch: rename "no_inline" field
@@ -173,10 +251,77 @@ of the repositories listed at
251
--------------------------------------------------
252
[Cooking]
253
176
-* fc/remote-hg (2013-04-04) 13 commits
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
261
+
262
+ Looked basically OK to me. Comments?
263
+
264
+
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
276
+
277
+ Improve error reporting from the http transfer clients.
278
+
279
+ Will merge to 'master'.
280
+
281
+
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
285
+
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.
288
+
289
+ Will merge to 'master'.
290
+
291
+
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
295
+
296
+ "git bundle" did not like a bundle created using a commit without
297
+ any message as its one of the prerequistes.
298
+
299
+ Will merge to 'master'.
300
+
301
+
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
306
+
307
+ The new core.commentchar configuration was not applied to a few
308
+ places.
309
+
310
+ Will merge to 'master'.
311
+
312
+
313
+* fc/remote-hg (2013-04-11) 21 commits
314
+ - remote-hg: activate graphlog extension for hg_log()
315
+ - remote-hg: fix bad file paths
316
+ - remote-hg: document location of stored hg repository
317
+ - remote-hg: fix bad state issue
318
+ - remote-hg: add 'insecure' option
319
+ - remote-hg: add simple mail test
320
+ - remote-hg: add basic author tests
321
+ - remote-hg: show more proper errors
322
+ - remote-hg: force remote push
323
- remote-hg: push to the appropriate branch
324
- remote-hg: update tags globally
179
- - remote-hg: force remote push
325
- remote-hg: update remote bookmarks
326
- remote-hg: refactor export
327
- remote-hg: split bookmark handling
@@ -188,29 +333,9 @@ of the repositories listed at
333
- remote-hg: add missing config variable in doc
334
- remote-hg: trivial cleanups
335
191
- The "forced push" may need to become optional behaviour.
192
- Also the tip one was found faulty.
193
-
194
- Expecting a reroll.
195
-
196
-
197
-* fc/transport-helper-waitpid (2013-04-07) 3 commits
198
- - SQUASH???
199
- - transport-helper: check if remote helper is alive
200
- - [EXPLAIN BETTER] run-command: add new check_command helper
336
+ Rerolled.
337
202
- Waiting for a response to summarize what this topic is about here.
203
-
204
-
205
-* js/rerere-forget-protect-against-NUL (2013-04-04) 2 commits
206
- (merged to 'next' on 2013-04-05 at 426d4e2)
207
- + rerere forget: do not segfault if not all stages are present
208
- + rerere forget: grok files containing NUL
209
-
210
- A few bugfixes to "git rerere" working on corner case merge
211
- conflicts.
212
-
213
- Will merge to 'master'.
338
+ Waiting for comments.
339
340
341
* mc/count-objects-kibibytes (2013-04-03) 1 commit
@@ -231,29 +356,19 @@ of the repositories listed at
356
Will merge to 'master'.
357
358
234
-* po/help-guides (2013-04-03) 5 commits
235
- (merged to 'next' on 2013-04-04 at 3d99b28)
236
- + doc: include --guide option description for "git help"
237
- + help: mention -a and -g option, and 'git help <concept>' usage.
238
- + builtin/help.c: add list_common_guides_help() function
239
- + builtin/help.c: add --guide option
240
- + builtin/help.c: split "-a" processing into two
241
-
242
- "git help" learned "-g" option to show the list of guides just like
243
- list of commands are given with "-a".
244
-
245
- Will merge to 'master'.
246
-
247
-
248
-* jk/http-dumb-namespaces (2013-04-04) 1 commit
359
+* jk/http-dumb-namespaces (2013-04-09) 1 commit
360
- http-backend: respect GIT_NAMESPACE with dumb clients
361
362
Allow smart-capable HTTP servers to be restricted via the
363
GIT_NAMESPACE mechanism when talking with commit-walker clients
364
(they already do so when talking with smart HTTP clients).
365
366
+ Will merge to 'next'.
367
+
368
+
369
256
-* jl/submodule-mv (2013-04-03) 3 commits
370
+* jl/submodule-mv (2013-04-11) 4 commits
371
+ - rm: delete .gitmodules entry of submodules removed from the work tree
372
- Teach mv to update the path entry in .gitmodules for moved submodules
373
- Teach mv to move submodules using a gitfile
374
- Teach mv to move submodules together with their work trees
@@ -266,22 +381,6 @@ of the repositories listed at
381
nd/magic-pathspecs topic.
382
383
269
-* sr/log-SG-no-textconv (2013-04-05) 6 commits
270
- (merged to 'next' on 2013-04-05 at 7f06945)
271
- + diffcore-pickaxe: unify code for log -S/-G
272
- + diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"
273
- + diffcore-pickaxe: port optimization from has_changes() to diff_grep()
274
- + diffcore-pickaxe: respect --no-textconv
275
- + diffcore-pickaxe: remove fill_one()
276
- + diffcore-pickaxe: remove unnecessary call to get_textconv()
277
-
278
- "git log -S/-G" started paying attention to textconv filter, but
279
- there was no way to disable this. Make it honor --no-textconv
280
- option.
281
-
282
- Will merge to 'master'.
283
-
284
-
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
@@ -292,6 +391,8 @@ of the repositories listed at
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
@@ -300,60 +401,32 @@ of the repositories listed at
401
402
403
* jk/diff-algo-finishing-touches (2013-04-05) 2 commits
303
- - diff: allow unstuck arguments with --diff-algorithm
304
- - git-merge(1): document diff-algorithm option to merge-recursive
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
307
- --diff-algorithm=algo".
409
+ --diff-algorithm=algo".
410
411
Will merge to 'next'.
412
413
414
* jk/diff-graph-submodule-summary (2013-04-05) 1 commit
313
- - submodule: print graph output next to submodule log
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.
419
420
Will merge to 'next'.
421
422
320
-* nd/pretty-formats (2013-04-01) 12 commits
321
- - pretty: support %>> that steal trailing spaces
322
- - pretty: support truncating in %>, %< and %><
323
- - pretty: support padding placeholders, %< %> and %><
324
- - pretty: add %C(auto) for auto-coloring on the next placeholder
325
- - pretty: two phase conversion for non utf-8 commits
326
- - utf8: keep NULs in reencode_string()
327
- - pretty: get the correct encoding for --pretty:format=%e
328
- - pretty: save commit encoding from logmsg_reencode if the caller needs it
329
- - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
330
- - utf8.c: move display_mode_esc_sequence_len() for use by other functions
331
- - pretty: share code between format_decoration and show_decorations
332
- - pretty-formats.txt: wrap long lines
333
-
334
- A mixed bag of a bugfix and two fun enhancements on pretty formats
335
- placeholder.
336
-
337
- Expecting a reroll.
338
-
339
-
340
-* jk/merge-tree-added-identically (2013-03-27) 1 commit
341
- - merge-tree: fix "same file added in subdir"
342
-
343
- We would most likely want to change things the other way around.
344
-
345
- Expecting a reroll.
346
-
347
-
348
-* ap/combine-diff-coalesce-lost (2013-03-25) 1 commit
349
- (merged to 'next' on 2013-03-29 at f6a05ca)
350
- + combine-diff: coalesce lost lines optimally
423
+* jk/merge-tree-added-identically (2013-04-08) 1 commit
424
+ - merge-tree: don't print entries that match "local"
425
352
- Attempts to minimize "diff -c/--cc" output by coalescing the same
353
- lines removed from the parents better, but with an O(n^2)
354
- complexity.
426
+ The resolution of some corner cases by "git merge-tree" were
427
+ inconsistent between top-of-the-tree and in a subdirectory.
428
356
- Will cook in 'next' to see if people with real-world usage scream.
429
+ Will merge to 'next'.
430
431
432
* kb/status-ignored-optim (2013-03-19) 8 commits
@@ -485,7 +558,11 @@ of the repositories listed at
558
Will cook in 'next' until Git 2.0.
559
560
488
-* tr/line-log (2013-04-05) 7 commits
561
+* 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
566
(merged to 'next' on 2013-04-05 at 5afb00c)
567
+ log -L: fix overlapping input ranges
568
+ log -L: check range set invariants when we look it up
@@ -496,9 +573,6 @@ of the repositories listed at
573
+ Export rewrite_parents() for 'log -L'
574
+ Refactor parse_loc
575
499
- Will merge down to 'master'
500
- with warts and all, hoping they get fixed eventually in-tree.
501
-
576
577
* jc/push-2.0-default-to-simple (2013-04-03) 13 commits
578
- push: switch default from "matching" to "simple"
@@ -521,3 +595,13 @@ of the repositories listed at
595
case.
596
597
Will cook in 'next' until Git 2.0.
598
+
599
+--------------------------------------------------
600
+[Discarded]
601
+
602
+* fc/transport-helper-waitpid (2013-04-07) 3 commits
603
+ . SQUASH???
604
+ . transport-helper: check if remote helper is alive
605
+ . [EXPLAIN BETTER] run-command: add new check_command helper
606
+
607
+ fc/transport-helper-error-reporting supersedes this topic.