What's cooking (2013/07 #07)
Junio C Hamano committed
Jul 21, 2013 at 23:52 UTC
8c84c1eb98ec78b3ceb7311820872be6456aacf8
1 file changed
+234
-306
whats-cooking.txt
+234
-306
@@ -1,18 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2013, #06; Thu, 18)
4
-X-master-at: b72c6161f1f34985e4a13f8c4c9ba9e55b3d1496
5
-X-next-at: 6b4ca9f6d2ab38b0a886be8faea27be3a50ef9e1
3
+Subject: What's cooking in git.git (Jul 2013, #07; Sun, 21)
4
+X-master-at: 805c5a578995db7594ad0751a683bc6422655c29
5
+X-next-at: e2c9e63a26e9480ed73a4f2615121c69962087b4
6
7
-What's cooking in git.git (Jul 2013, #06; Thu, 18)
7
+What's cooking in git.git (Jul 2013, #07; Sun, 21)
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 code and documentation clean-up patches have been
15
-applied to 'master'.
14
+Quite a many documentation clean-up patches that are already in
15
+'master' have been applied to 'maint'. Hopefully 1.8.3.4 will be
16
+the last of the 1.8.3.x maintenance series.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -20,168 +21,188 @@ of the repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
23
-[Graduated to "master"]
24
+[New Topics]
25
25
-* bc/commit-invalid-utf8 (2013-07-09) 3 commits
26
- (merged to 'next' on 2013-07-11 at a2ee572)
27
- + commit: reject non-characters
28
- + commit: reject overlong UTF-8 sequences
29
- + commit: reject invalid UTF-8 codepoints
26
+* mm/color-auto-default (2013-07-19) 1 commit
27
+ (merged to 'next' on 2013-07-19 at 880d984)
28
+ + git add -e: Explicitly specify that patch should have no color
29
31
- Tighten up autodetection of UTF-8 encoded strings.
30
+ A finishing touch to fix breakage to "add -e" caused by defaulting
31
+ ui.color to "auto".
32
33
+ Will merge to 'master'.
34
34
-* bc/push-match-many-refs (2013-07-08) 1 commit
35
- (merged to 'next' on 2013-07-11 at df4d56d)
36
- + remote.c: avoid O(m*n) behavior in match_push_refs
35
38
- Pushing to repositories with many refs employed O(m*n) algorithm
39
- where n is the number of refs on the receiving end.
36
+* jc/simple-add-must-be-a-no-op (2013-07-19) 1 commit
37
+ (merged to 'next' on 2013-07-19 at a1543ee)
38
+ + t2202: make sure "git add" (no args) stays a no-op
39
40
+ This detected a mismerge of one of "add-2.0" topics to the 'jch'
41
+ and 'pu' branches.
42
42
-* bc/send-email-use-port-as-separate-param (2013-07-04) 1 commit
43
- (merged to 'next' on 2013-07-09 at a569eb5)
44
- + send-email: provide port separately from hostname
43
+ Will merge to 'master'.
44
46
- Pass port number as a separate argument when send-email initializes
47
- Net::SMTP, instead of as a part of the hostname, i.e. host:port.
48
- This allows GSSAPI codepath to match with the hostname given.
45
46
+* jm/doc-ref-prune (2013-07-18) 2 commits
47
+ - Documentation: fix git-prune example usage
48
+ - Documentation: remove --prune from pack-refs examples
49
51
-* bp/mediawiki-preview (2013-07-08) 7 commits
52
- (merged to 'next' on 2013-07-12 at 870890a)
53
- + git-remote-mediawiki: add preview subcommand into git mw
54
- + git-remote-mediawiki: add git-mw command
55
- + git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki
56
- + git-remote-mediawiki: update tests to run with the new bin-wrapper
57
- + git-remote-mediawiki: add a git bin-wrapper for developement
58
- + wrap-for-bin: make bin-wrappers chainable
59
- + git-remote-mediawiki: introduction of Git::Mediawiki.pm
50
+ Will merge to 'next' and then 'master'.
51
61
- Add a command to allow previewing the contents locally before
62
- pushing it out, when working with a MediaWiki remote.
52
64
- I personally do not think this belongs to Git. If you are working
65
- on a set of AsciiDoc source files, you sure do want to locally
66
- format to preview what you will be pushing out, and if you are
67
- working on a set of C or Java source files, you do want to test it
68
- before pushing it out, too. That kind of thing belongs to your
69
- build script, not to your SCM.
53
+* rj/sparse (2013-07-21) 1 commit
54
+ - Revert "compat/unsetenv.c: Fix a sparse warning"
55
71
- But I'll let it pass, as this is only a contrib/ thing.
56
+ Will merge to 'next' and then 'master'.
57
58
74
-* cp/submodule-custom-update (2013-07-03) 1 commit
75
- (merged to 'next' on 2013-07-09 at 3d27516)
76
- + submodule update: allow custom command to update submodule working tree
59
+* sb/traverse-trees-bitmask-variable-name (2013-07-19) 1 commit
60
+ - traverse_trees(): clarify return value of the callback
61
78
- In addition to the choice from "rebase, merge, or checkout-detach",
79
- allow a custom command to be used in "submodule update" to update
80
- the working tree of submodules.
62
+ Will merge to 'next' and then 'master'.
63
64
+--------------------------------------------------
65
+[Stalled]
66
83
-* es/overlapping-range-set (2013-07-09) 2 commits
84
- (merged to 'next' on 2013-07-11 at 3df5a94)
85
- + range_set: fix coalescing bug when range is a subset of another
86
- + t4211: fix broken test when one -L range is subset of another
67
+* jk/fast-import-empty-ls (2013-06-23) 4 commits
68
+ - fast-import: allow moving the root tree
69
+ - fast-import: allow ls or filecopy of the root tree
70
+ - fast-import: set valid mode on root tree in "ls"
71
+ - t9300: document fast-import empty path issues
72
73
+ Comments?
74
89
-* fg/submodule-clone-depth (2013-07-03) 1 commit
90
- (merged to 'next' on 2013-07-09 at ab156f3)
91
- + Add --depth to submodule update/add
75
93
- Allow shallow-cloning of submodules with "git submodule update".
76
+* tf/gitweb-ss-tweak (2013-07-15) 4 commits
77
+ - gitweb: make search help link less ugly
78
+ - gitweb: omit the repository owner when it is unset
79
+ - gitweb: vertically centre contents of page footer
80
+ - gitweb: ensure OPML text fits inside its box
81
82
+ Comments?
83
96
-* jc/revert-clone-doc-update-for-push-from-shallow (2013-07-15) 1 commit
97
- + Revert "git-clone.txt: remove the restriction on pushing from a shallow clone"
84
85
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
86
+ - ### DONTMERGE: needs better explanation on what config they need
87
+ - pack-refs.c: Add missing call to git_config()
88
+ - show-ref.c: Add missing call to git_config()
89
100
-* jk/fetch-pack-many-refs (2013-07-02) 3 commits
101
- (merged to 'next' on 2013-07-09 at a53b7c7)
102
- + fetch-pack: avoid quadratic behavior in rev_list_push
103
- + commit.c: make compare_commits_by_commit_date global
104
- + fetch-pack: avoid quadratic list insertion in mark_complete
90
+ The changes themselves are probably good, but it is unclear what
91
+ basic setting needs to be read for which exact operation.
92
106
- Fetching between repositories with many refs employed O(n^2)
107
- algorithm to match up the common objects, which has been corrected.
93
+ Waiting for clarification.
94
+ $gmane/228294
95
96
110
-* jk/format-patch-from (2013-07-03) 2 commits
111
- (merged to 'next' on 2013-07-09 at 6ed86d5)
112
- + teach format-patch to place other authors into in-body "From"
113
- + pretty.c: drop const-ness from pretty_print_context
97
+* jh/shorten-refname (2013-05-07) 4 commits
98
+ - t1514: refname shortening is done after dereferencing symbolic refs
99
+ - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
100
+ - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
101
+ - t1514: Add tests of shortening refnames in strict/loose mode
102
115
- "git format-patch" learned "--from[=whom]" option, which sets the
116
- "From: " header to the specified person (or the person who runs the
117
- command, if "=whom" part is missing) and move the original author
118
- information to an in-body From: header as necessary.
103
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
104
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
105
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
106
+ ref that points at remotes/origin/something, then it should show
107
+ "origin/something" and it already does).
108
109
+ Expecting a reroll, as an early part of a larger series.
110
+ $gmane/225137
111
121
-* jk/in-pack-size-measurement (2013-07-12) 10 commits
122
- (merged to 'next' on 2013-07-12 at 5ba720f)
123
- + pack-revindex: radix-sort the revindex
124
- + pack-revindex: use unsigned to store number of objects
125
- + cat-file: split --batch input lines on whitespace
126
- + cat-file: add %(objectsize:disk) format atom
127
- + cat-file: add --batch-check=<format>
128
- + cat-file: refactor --batch option parsing
129
- + cat-file: teach --batch to stream blob objects
130
- + t1006: modernize output comparisons
131
- + teach sha1_object_info_extended a "disk_size" query
132
- + zero-initialize object_info structs
133
- (this branch is used by jk/cat-file-batch-optim.)
112
135
- Allow on-disk footprint of objects in packfiles (often they are a
136
- lot smaller than their true size, when expressed as deltas).
113
+* jl/submodule-mv (2013-04-23) 5 commits
114
+ . submodule.c: duplicate real_path's return value
115
+ . rm: delete .gitmodules entry of submodules removed from the work tree
116
+ . Teach mv to update the path entry in .gitmodules for moved submodules
117
+ . Teach mv to move submodules using a gitfile
118
+ . Teach mv to move submodules together with their work trees
119
120
+ "git mv A B" when moving a submodule A does "the right thing",
121
+ inclusing relocating its working tree and adjusting the paths in
122
+ the .gitmodules file.
123
139
-* jk/maint-clone-shared-no-connectivity-validation (2013-07-08) 1 commit
140
- (merged to 'next' on 2013-07-11 at 8183412)
141
- + clone: drop connectivity check for local clones
142
- (this branch is used by jk/clone-shared-no-connectivity-validation.)
124
+ Ejected from 'pu', as it conflicts with nd/magic-pathspec.
125
144
- "git clone -s/-l" is a filesystem level copy and does not offer any
145
- protection against source repository being corrupt. While the
146
- connectivity validation checks commits and trees being readable, it
147
- made the otherwise instantaneous local modes of clone much more
148
- expensive, without protecting blob data from bitflips.
126
127
+* jk/list-objects-sans-blobs (2013-06-06) 4 commits
128
+ . archive: ignore blob objects when checking reachability
129
+ . list-objects: optimize "revs->blob_objects = 0" case
130
+ . upload-archive: restrict remote objects with reachability check
131
+ . clear parsed flag when we free tree buffers
132
151
-* mv/merge-ff-tristate (2013-07-02) 1 commit
152
- (merged to 'next' on 2013-07-09 at c32b95d)
153
- + merge: handle --ff/--no-ff/--ff-only as a tri-state option
133
+ Attempt to allow "archive --remote=$there $arbitrary_sha1" while
134
+ keeping the reachability safety.
135
155
- The configuration variable "merge.ff" was cleary a tri-state to
156
- choose one from "favor fast-forward when possible", "always create
157
- a merge even when the history could fast-forward" and "do not
158
- create any merge, only update when the history fast-forwards", but
159
- the command line parser did not implement the usual convention of
160
- "last one wins, and command line overrides the configuration"
161
- correctly.
136
+ Seems to break some tests in a trivial and obvious way.
137
138
164
-* rr/rebase-reflog-message-reword (2013-06-23) 2 commits
165
- (merged to 'next' on 2013-07-11 at 59921e0)
166
- + rebase -i: use a better reflog message
167
- + rebase: use a better reflog message
139
+* mg/more-textconv (2013-05-10) 7 commits
140
+ - grep: honor --textconv for the case rev:path
141
+ - grep: allow to use textconv filters
142
+ - t7008: demonstrate behavior of grep with textconv
143
+ - cat-file: do not die on --textconv without textconv filters
144
+ - show: honor --textconv for blobs
145
+ - diff_opt: track whether flags have been set explicitly
146
+ - t4030: demonstrate behavior of show with textconv
147
169
- "git rebase [-i]" used to leave just "rebase" as its reflog message
170
- for some operations. This rewords them to be more informative.
148
+ Make "git grep" and "git show" pay attention to --textconv when
149
+ dealing with blob objects.
150
151
+ I thought this was pretty well designed and executed, but it seems
152
+ there are some doubts on the list; kicked back to 'pu'.
153
173
-* rs/mailmap-himself (2013-07-17) 1 commit
174
- + .mailmap: René Scharfe has a new email address
154
155
+* jc/format-patch (2013-04-22) 2 commits
156
+ - format-patch: --inline-single
157
+ - format-patch: rename "no_inline" field
158
+
159
+ A new option to send a single patch to the standard output to be
160
+ appended at the bottom of a message. I personally have no need for
161
+ this, but it was easy enough to cobble together. Tests, docs and
162
+ stripping out more MIMEy stuff are left as exercises to interested
163
+ parties.
164
+
165
+ Not ready for inclusion.
166
+
167
+ Will discard unless we hear from anybody who is interested in
168
+ tying its loose ends.
169
177
-* sb/mailmap-updates (2013-07-17) 3 commits
178
- + .mailmap: combine more (email, name) to individual persons
179
- (merged to 'next' on 2013-07-15 at 61c965a)
180
- + .mailmap: Combine more (email, name) to individual persons
181
- + .mailmap: Map email addresses to names
170
+
171
+* jk/gitweb-utf8 (2013-04-08) 4 commits
172
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
173
+ - gitweb: Don't append ';js=(0|1)' to external links
174
+ - gitweb: Make feed title valid utf8
175
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
176
+
177
+ Various fixes to gitweb.
178
+
179
+ Drew Northup volunteered to take a look into this.
180
+ $gmane/226216
181
+
182
+
183
+* jc/show-branch (2013-06-07) 5 commits
184
+ - show-branch: use commit slab to represent bitflags of arbitrary width
185
+ - show-branch.c: remove "all_mask"
186
+ - show-branch.c: abstract out "flags" operation
187
+ - show-branch.c: lift all_mask/all_revs to a global static
188
+ - show-branch.c: update comment style
189
+
190
+ Waiting for the final step to lift the hard-limit before sending it out.
191
192
--------------------------------------------------
184
-[New Topics]
193
+[Cooking]
194
+
195
+* mh/multimail (2013-07-15) 2 commits
196
+ - post-receive-email: deprecate script in favor of git-multimail
197
+ - git-multimail: an improved replacement for post-receive-email
198
+
199
+ An enhanced "post-receive" hook to send e-mail messages.
200
+
201
+ I tend to agree that the wording of the tip one is a bit too
202
+ strong. An old script does not necessarily have to be avoided by
203
+ its existing users only because it has not got updates for a long
204
+ time.
205
+
206
207
* db/show-ref-head (2013-07-17) 1 commit
208
(merged to 'next' on 2013-07-18 at 73797d0)
@@ -221,14 +242,14 @@ of the repositories listed at
242
Will merge to 'master'.
243
244
224
-* jc/diff-filter-negation (2013-07-17) 6 commits
245
+* jc/diff-filter-negation (2013-07-19) 6 commits
246
- diff: deprecate -q option to diff-files
247
- diff: allow lowercase letter to specify what change class to exclude
248
- diff: reject unknown change class given to --diff-filter
249
- diff: preparse --diff-filter string argument
250
- diff: factor out match_filter()
251
- diff: pass the whole diff_options to diffcore_apply_filter()
231
- (this branch is used by jc/diff-2.0-remove-q-synonym-for-no-deletion.)
252
+ (this branch is used by jc/hold-diff-remove-q-synonym-for-no-deletion.)
253
254
Teach "git diff --diff-filter" to express "I do not want to see
255
these classes of changes" more directly by listing only the
@@ -236,13 +257,13 @@ of the repositories listed at
257
everything but deletion) and deprecate "diff-files -q" which did
258
the same thing as "--diff-filter=d".
259
239
- Waiting for comments.
260
+ Will merge to 'next'.
261
262
263
* mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit
264
- do_one_ref(): save and restore value of current_ref
265
245
- May want some tests?
266
+ Needs a bit better description to be placed in the Release Notes.
267
268
269
* ml/avoid-using-grep-on-crlf-files (2013-07-18) 1 commit
@@ -253,15 +274,20 @@ of the repositories listed at
274
extract matching lines may lose the CR at the end of lines that
275
match, causing the actual output not to match the expected output.
276
256
- Waiting for success reports from folks on various flavours of
257
- Windows ports.
277
+ Will merge to 'next'.
278
+
279
280
+* ml/cygwin-updates (2013-07-21) 4 commits
281
+ - cygwin: stop forcing core.filemode=false
282
+ - Cygwin 1.7 supports mmap
283
+ - Cygwin 1.7 has thread-safe pread
284
+ - Cygwin 1.7 needs compat/regex
285
260
-* ml/cygwin-updates (2013-07-15) 2 commits
261
- - Use compat/regex on Cygwin
262
- - Cygwin has trustable filemode
286
+ The tip one does _not_ revert c869753e (Force core.filemode to
287
+ false on Cygwin., 2006-12-30) on purpose, so that people can
288
+ still retain the old behaviour if they wanted to.
289
264
- This seems to depend heavily on Cygwin version differences.
290
+ Will merge to 'next'.
291
292
293
* mm/diff-no-patch-synonym-to-s (2013-07-17) 6 commits
@@ -342,15 +368,18 @@ of the repositories listed at
368
This is an earlier part of a 6 patch series, with log message
369
corrected.
370
371
+ Will merge to 'next'.
372
+
373
374
* sb/misc-fixes (2013-07-15) 3 commits
347
- - diff.c: Do not initialize a variable, which gets reassigned anyway.
348
- - commit: Fix a memory leak in determine_author_info
349
- - daemon.c:handle: Remove unneeded check for null pointer.
375
+ (merged to 'next' on 2013-07-21 at 880b08c)
376
+ + diff.c: Do not initialize a variable, which gets reassigned anyway.
377
+ + commit: Fix a memory leak in determine_author_info
378
+ + daemon.c:handle: Remove unneeded check for null pointer.
379
380
Assorted code cleanups and a minor fix.
381
353
- Will merge to 'next'.
382
+ Will merge to 'master'.
383
384
385
* sb/parse-object-buffer-eaten (2013-07-17) 1 commit
@@ -380,147 +409,27 @@ of the repositories listed at
409
Will merge to 'master'.
410
411
383
-* jc/diff-2.0-remove-q-synonym-for-no-deletion (2013-07-18) 1 commit
384
- - diff: remove "diff-files -q" at Git 2.0 version boundary
385
- (this branch uses jc/diff-filter-negation.)
386
-
387
- This obviously has to wait until Git 2.0.
388
-
389
---------------------------------------------------
390
-[Stalled]
391
-
392
-* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
393
- - ### DONTMERGE: needs better explanation on what config they need
394
- - pack-refs.c: Add missing call to git_config()
395
- - show-ref.c: Add missing call to git_config()
396
-
397
- The changes themselves are probably good, but it is unclear what
398
- basic setting needs to be read for which exact operation.
399
-
400
- Waiting for clarification.
401
- $gmane/228294
402
-
403
-
404
-* jh/shorten-refname (2013-05-07) 4 commits
405
- - t1514: refname shortening is done after dereferencing symbolic refs
406
- - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
407
- - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
408
- - t1514: Add tests of shortening refnames in strict/loose mode
409
-
410
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
411
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
412
- "origin/HEAD", which is fixed with this series (if it is a symbolic
413
- ref that points at remotes/origin/something, then it should show
414
- "origin/something" and it already does).
415
-
416
- Expecting a reroll, as an early part of a larger series.
417
- $gmane/225137
418
-
419
-
420
-* jl/submodule-mv (2013-04-23) 5 commits
421
- . submodule.c: duplicate real_path's return value
422
- . rm: delete .gitmodules entry of submodules removed from the work tree
423
- . Teach mv to update the path entry in .gitmodules for moved submodules
424
- . Teach mv to move submodules using a gitfile
425
- . Teach mv to move submodules together with their work trees
426
-
427
- "git mv A B" when moving a submodule A does "the right thing",
428
- inclusing relocating its working tree and adjusting the paths in
429
- the .gitmodules file.
430
-
431
- Ejected from 'pu', as it conflicts with nd/magic-pathspec.
432
-
433
-
434
-* jk/list-objects-sans-blobs (2013-06-06) 4 commits
435
- . archive: ignore blob objects when checking reachability
436
- . list-objects: optimize "revs->blob_objects = 0" case
437
- . upload-archive: restrict remote objects with reachability check
438
- . clear parsed flag when we free tree buffers
439
-
440
- Attempt to allow "archive --remote=$there $arbitrary_sha1" while
441
- keeping the reachability safety.
442
-
443
- Seems to break some tests in a trivial and obvious way.
444
-
445
-
446
-* mg/more-textconv (2013-05-10) 7 commits
447
- - grep: honor --textconv for the case rev:path
448
- - grep: allow to use textconv filters
449
- - t7008: demonstrate behavior of grep with textconv
450
- - cat-file: do not die on --textconv without textconv filters
451
- - show: honor --textconv for blobs
452
- - diff_opt: track whether flags have been set explicitly
453
- - t4030: demonstrate behavior of show with textconv
454
-
455
- Make "git grep" and "git show" pay attention to --textconv when
456
- dealing with blob objects.
457
-
458
- I thought this was pretty well designed and executed, but it seems
459
- there are some doubts on the list; kicked back to 'pu'.
460
-
461
-
462
-* mh/multimail (2013-07-15) 2 commits
463
- - post-receive-email: deprecate script in favor of git-multimail
464
- - git-multimail: an improved replacement for post-receive-email
465
-
466
- An enhanced "post-receive" hook to send e-mail messages.
467
-
468
- Will wait for the review for the tip one to settle and then merge.
469
-
470
-
471
-* jc/format-patch (2013-04-22) 2 commits
472
- - format-patch: --inline-single
473
- - format-patch: rename "no_inline" field
474
-
475
- A new option to send a single patch to the standard output to be
476
- appended at the bottom of a message. I personally have no need for
477
- this, but it was easy enough to cobble together. Tests, docs and
478
- stripping out more MIMEy stuff are left as exercises to interested
479
- parties.
480
-
481
- Not ready for inclusion.
482
-
483
- Will discard unless we hear from anybody who is interested in
484
- tying its loose ends.
485
-
486
-
487
-* jk/gitweb-utf8 (2013-04-08) 4 commits
488
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
489
- - gitweb: Don't append ';js=(0|1)' to external links
490
- - gitweb: Make feed title valid utf8
491
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
492
-
493
- Various fixes to gitweb.
494
-
495
- Drew Northup volunteered to take a look into this.
496
- $gmane/226216
497
-
498
-
499
-* jc/show-branch (2013-06-07) 5 commits
500
- - show-branch: use commit slab to represent bitflags of arbitrary width
501
- - show-branch.c: remove "all_mask"
502
- - show-branch.c: abstract out "flags" operation
503
- - show-branch.c: lift all_mask/all_revs to a global static
504
- - show-branch.c: update comment style
505
-
506
- Waiting for the final step to lift the hard-limit before sending it out.
507
-
508
---------------------------------------------------
509
-[Cooking]
510
-
412
* rr/send-email-ssl-verify (2013-07-18) 1 commit
512
- - send-email: be explicit with SSL certificate verification
413
+ (merged to 'next' on 2013-07-21 at 62099ff)
414
+ + send-email: be explicit with SSL certificate verification
415
514
- Waiting for test reports.
416
+ Newer Net::SMTP::SSL module does not want the user programs to use
417
+ the default behaviour to let server certificate go without
418
+ verification, so by default enable the verification with a
419
+ mechanism to turn it off if needed.
420
+
421
+ Will merge to 'master'.
422
423
424
* es/check-mailmap (2013-07-13) 2 commits
518
- - t4203: test check-mailmap command invocation
519
- - builtin: add git-check-mailmap command
425
+ (merged to 'next' on 2013-07-21 at 23c5363)
426
+ + t4203: test check-mailmap command invocation
427
+ + builtin: add git-check-mailmap command
428
+ (this branch is used by es/contacts.)
429
430
A new command to allow scripts to query the mailmap information.
431
523
- Will merge to 'next'.
432
+ Will merge to 'master'.
433
434
435
* jc/check-x-z (2013-07-11) 4 commits
@@ -576,15 +485,6 @@ of the repositories listed at
485
Will merge to 'master'.
486
487
579
-* tf/gitweb-ss-tweak (2013-07-15) 4 commits
580
- - gitweb: make search help link less ugly
581
- - gitweb: omit the repository owner when it is unset
582
- - gitweb: vertically centre contents of page footer
583
- - gitweb: ensure OPML text fits inside its box
584
-
585
- Waiting for comments.
586
-
587
-
488
* tr/fd-gotcha-fixes (2013-07-12) 2 commits
489
(merged to 'next' on 2013-07-18 at 30f4fdf)
490
+ run-command: dup_devnull(): guard against syscalls failing
@@ -619,15 +519,18 @@ of the repositories listed at
519
520
521
* ms/fetch-prune-configuration (2013-07-18) 1 commit
622
- - fetch: make --prune configurable
522
+ (merged to 'next' on 2013-07-21 at 7ffb690)
523
+ + fetch: make --prune configurable
524
525
Allow fetch.prune and remote.*.prune configuration variables to be set,
526
and "git fetch" to behave as if "--prune" is given.
527
627
- Will merge to 'next'.
528
+ Will merge to 'master'.
529
530
630
-* jk/gcc-function-attributes (2013-07-09) 3 commits
531
+* jk/gcc-function-attributes (2013-07-19) 4 commits
532
+ (merged to 'next' on 2013-07-19 at 5f6ad91)
533
+ + Add the LAST_ARG_MUST_BE_NULL macro
534
(merged to 'next' on 2013-07-12 at 5a7081f)
535
+ wt-status: use "format" function attribute for status_printf
536
+ use "sentinel" function attribute for variadic lists
@@ -640,13 +543,16 @@ of the repositories listed at
543
Will merge to 'master'.
544
545
643
-* km/http-curl-config-per-url (2013-07-12) 2 commits
644
- - config: add support for http.<url>.* settings
645
- - http.c: fix parsing of http.sslCertPasswordProtected variable
546
+* km/http-curl-config-per-url (2013-07-21) 5 commits
547
+ . config: allow http.<url>.* any user matching
548
+ . tests: add new test for the url_normalize function
549
+ . config: improve support for http.<url>.* settings
550
+ . config: add support for http.<url>.* settings
551
+ . http.c: fix parsing of http.sslCertPasswordProtected variable
552
553
Allows custom curl configuration per URL when talking over http.
648
-
649
- There is a reroll that needs to be picked up after discussion.
554
+ Tentatively ejected as I did not seem to have received some binary
555
+ files correctly.
556
557
558
* hv/config-from-blob (2013-07-12) 5 commits
@@ -680,7 +586,9 @@ of the repositories listed at
586
Will merge to 'master'.
587
588
683
-* km/svn-1.8-serf-only (2013-07-07) 2 commits
589
+* km/svn-1.8-serf-only (2013-07-18) 3 commits
590
+ (merged to 'next' on 2013-07-19 at ab8d034)
591
+ + Git.pm: revert _temp_cache use of temp_is_locked
592
(merged to 'next' on 2013-07-12 at 70e0b95)
593
+ git-svn: allow git-svn fetching to work using serf
594
+ Git.pm: add new temp_is_locked function
@@ -688,7 +596,7 @@ of the repositories listed at
596
Subversion 1.8.0 that was recently released breaks older subversion
597
clients coming over http/https in various ways.
598
691
- Are people on older Subversion happy with this change?
599
+ Will cook for a while.
600
601
602
* tr/merge-recursive-index-only (2013-07-07) 3 commits
@@ -696,6 +604,13 @@ of the repositories listed at
604
- merge-recursive: untangle double meaning of o->call_depth
605
- merge-recursive: remove dead conditional in update_stages()
606
607
+ What's the status of this one?
608
+
609
+ I am not particularly fond of the second patch that conceptually
610
+ allows updating working tree during a virtual merge (i.e. addition
611
+ of o->no_worktree is fine, but there needs a way to make sure it is
612
+ never set to false when o->depth is not zero).
613
+
614
615
* jc/push-cas (2013-07-17) 6 commits
616
- t5533: test "push --lockref"
@@ -711,11 +626,16 @@ of the repositories listed at
626
627
The machinery is more or less ready. The "--force" option is again
628
the big red button to override any safety, thanks to J6t's sanity
714
- (the original round allowed --lockref to defeat --force). The
715
- logic to choose the default for --lockref is suitable only for the
716
- simplest workflows, and may hurt users more than help them.
629
+ (the original round allowed --lockref to defeat --force).
630
+
631
+ I have strong doubts on the merit of the logic to choose the
632
+ default for "--lockref" implemented here. It is suitable only for
633
+ the simplest workflows, and it may hurt users more than it helps
634
+ them.
635
718
- Waiting for comments.
636
+ Also the option may be called something with "--force" prefix, as
637
+ it is a weaker and more controlled form of "--force" that is used
638
+ to defeat the usual "must fast-forward" safety.
639
640
641
* nd/const-struct-cache-entry (2013-07-09) 1 commit
@@ -725,10 +645,13 @@ of the repositories listed at
645
Will merge to 'master'.
646
647
728
-* es/contacts (2013-07-03) 3 commits
648
+* es/contacts (2013-07-21) 5 commits
649
+ - contrib: contacts: add documentation
650
+ - contrib: contacts: add mailmap support
651
- contrib: contacts: interpret committish akin to format-patch
652
- contrib: contacts: add ability to parse from committish
653
- contrib: add git-contacts helper
654
+ (this branch uses es/check-mailmap.)
655
656
A helper to read from a set of format-patch output files or a range
657
of commits and find those who may have insights to the code that
@@ -739,10 +662,10 @@ of the repositories listed at
662
in-tree. Assuming that "git contact" is something we may want to
663
have as a member of the official set of commands someday, that is.
664
742
- Perhaps this should be rebased on es/check-mailmap to utilize it.
665
+ Will merge to 'next'.
666
667
745
-* jc/pull-training-wheel (2013-07-18) 1 commit
668
+* jc/pull-training-wheel (2013-07-19) 1 commit
669
- pull: require choice between rebase/merge on non-fast-forward pull
670
671
Make "git pull" (without arguments that say what branch to
@@ -756,23 +679,19 @@ of the repositories listed at
679
680
for full discussion.
681
759
- Waiting for reviews.
760
-
761
-
762
-* jk/fast-import-empty-ls (2013-06-23) 4 commits
763
- - fast-import: allow moving the root tree
764
- - fast-import: allow ls or filecopy of the root tree
765
- - fast-import: set valid mode on root tree in "ls"
766
- - t9300: document fast-import empty path issues
767
-
768
- Waiting for reviews.
769
- $gmane/228741
682
+ Will merge to 'next'.
683
684
685
* rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit
686
- cygwin: Remove the Win32 l/stat() implementation
687
775
- Waiting for the discussion to settle.
688
+ Cygwin port added a "not quite correct but a lot faster and good
689
+ enough for many lstat() calls that are only used to see if the
690
+ working tree entity matches the index entry" lstat() emulation some
691
+ time ago, and it started biting us in places. This removes it and
692
+ uses the standard lstat() that comes with Cygwin.
693
+
694
+ I am personally in favor of this simpler solution. Comments?
695
696
697
* jc/reflog-doc (2013-06-19) 1 commit
@@ -790,6 +709,8 @@ of the repositories listed at
709
This requires the platform lstat() to be correct to avoid false
710
negatives.
711
712
+ Will merge to 'next'.
713
+
714
715
* jx/clean-interactive (2013-06-26) 16 commits
716
(merged to 'next' on 2013-07-12 at 61dd42d)
@@ -844,3 +765,10 @@ of the repositories listed at
765
aka "--no-ignore-removal".
766
767
Will cook in 'next' until Git 2.0.
768
+
769
+
770
+* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit
771
+ - diff: remove "diff-files -q" in a version of Git in a distant future
772
+ (this branch uses jc/diff-filter-negation.)
773
+
774
+ This obviously has to wait until a distant future.