What's cooking (2013/06 #06)
Junio C Hamano committed
Jun 18, 2013 at 13:38 UTC
b2e2b5cea3fe248bc9f688da30a77bf6c9b363ef
1 file changed
+326
-258
whats-cooking.txt
+326
-258
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2013, #05; Sat, 15)
4
-X-master-at: 0dbd81251dbc516bb3bf07862c369fc582a4e5e0
5
-X-next-at: 22819c950c7ed8ce0f8755d6134a6eae6064f6d0
3
+Subject: What's cooking in git.git (Jun 2013, #06; Tue, 18)
4
+X-master-at: fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c
5
+X-next-at: 12cfec846bdac68981fbf455e2a638ddf5a6ef9c
6
7
-What's cooking in git.git (Jun 2013, #05; Sat, 15)
7
+What's cooking in git.git (Jun 2013, #06; Tue, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -16,256 +16,170 @@ of the repositories listed at
16
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
---------------------------------------------------
20
-[Graduated to "master"]
21
-
22
-* bp/mediawiki-credential (2013-06-05) 1 commit
23
- (merged to 'next' on 2013-06-05 at ea07ec1)
24
- + git-remote-mediawiki: use Git.pm functions for credentials
25
-
26
- The bridge to MediaWiki has been updated to use the credential
27
- helper interface in Git.pm, losing its own and the original
28
- implementation the former was based on.
29
-
30
-
31
-* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
32
- (merged to 'next' on 2013-06-05 at 193242b)
33
- + revision.c: make default history consider bottom commits
34
- + revision.c: don't show all merges for --parents
35
- + revision.c: discount side branches when computing TREESAME
36
- + revision.c: add BOTTOM flag for commits
37
- + simplify-merges: drop merge from irrelevant side branch
38
- + simplify-merges: never remove all TREESAME parents
39
- + t6012: update test for tweaked full-history traversal
40
- + revision.c: Make --full-history consider more merges
41
- + Documentation: avoid "uninteresting"
42
- + rev-list-options.txt: correct TREESAME for P
43
- + t6111: add parents to tests
44
- + t6111: allow checking the parents as well
45
- + t6111: new TREESAME test set
46
- + t6019: test file dropped in -s ours merge
47
- + decorate.c: compact table when growing
48
-
49
- Major update to a very core part of the revision traversal logic to
50
- improve culling of irrelevant parents while traversing a mergy
51
- history.
52
-
53
-
54
-* mh/reflife (2013-06-02) 25 commits
55
- (merged to 'next' on 2013-06-05 at 291d863)
56
- + refs: document the lifetime of the args passed to each_ref_fn
57
- + register_ref(): make a copy of the bad reference SHA-1
58
- + exclude_existing(): set existing_refs.strdup_strings
59
- + string_list_add_refs_by_glob(): add a comment about memory management
60
- + string_list_add_one_ref(): rename first parameter to "refname"
61
- + show_head_ref(): rename first parameter to "refname"
62
- + show_head_ref(): do not shadow name of argument
63
- + add_existing(): do not retain a reference to sha1
64
- + do_fetch(): clean up existing_refs before exiting
65
- + do_fetch(): reduce scope of peer_item
66
- + object_array_entry: fix memory handling of the name field
67
- + find_first_merges(): remove unnecessary code
68
- + find_first_merges(): initialize merges variable using initializer
69
- + fsck: don't put a void*-shaped peg in a char*-shaped hole
70
- + object_array_remove_duplicates(): rewrite to reduce copying
71
- + revision: use object_array_filter() in implementation of gc_boundary()
72
- + object_array: add function object_array_filter()
73
- + revision: split some overly-long lines
74
- + cmd_diff(): make it obvious which cases are exclusive of each other
75
- + cmd_diff(): rename local variable "list" -> "entry"
76
- + cmd_diff(): use an object_array for holding trees
77
- + builtin_diff_tree(): make it obvious that function wants two entries
78
- + add_rev_cmdline(): make a copy of the name argument
79
- + fetch: make own copies of refnames
80
- + describe: make own copy of refname
81
- (this branch is used by mh/ref-races.)
82
-
83
- Define memory ownership and lifetime rules for what for-each-ref
84
- feeds to its callbacks (in short, "you do not own it, so make a
85
- copy if you want to keep it").
86
-
87
-
88
-* mt/send-email-cc-match-fix (2013-06-05) 7 commits
89
- (merged to 'next' on 2013-06-06 at e4d0831)
90
- + test-send-email: test for pre-sanitized self name
91
- + t/send-email: test suppress-cc=self with non-ascii
92
- + t/send-email: add test with quoted sender
93
- + send-email: make --suppress-cc=self sanitize input
94
- + t/send-email: test suppress-cc=self on cccmd
95
- + send-email: fix suppress-cc=self on cccmd
96
- + t/send-email.sh: add test for suppress-cc=self
97
-
98
- Logic git-send-email used to suppress cc mishandled names like "A
99
- U. Thor" <author@example.xz>, where the human readable part needs
100
- to be quoted (the user input may not have the double quotes around
101
- the name, and comparison was done between quoted and unquoted
102
- strings).
103
-
104
-
105
-* rr/complete-difftool-fixup (2013-06-09) 2 commits
106
- (merged to 'next' on 2013-06-11 at fe91170)
107
- + completion: show can take both revlist and paths
108
- + completion: difftool takes both revs and files
109
- (this branch is tangled with rr/complete-difftool.)
110
-
111
- "git difftool" can take both revs to be compared and pathspecs.
112
- "git show" takes revs, revs:path and pathspecs.
113
-
114
-
115
-* rr/remove-contrib-some (2013-06-12) 2 commits
116
- (merged to 'next' on 2013-06-12 at 797644c)
117
- + contrib: drop blameview/ directory
118
- (merged to 'next' on 2013-06-05 at fc15705)
119
- + contrib: remove continuous/ and patches/
120
-
121
- Remove stale contrib/ material.
122
-
19
--------------------------------------------------
20
[New Topics]
21
126
-* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
127
- - prompt: squelch error output from cat
22
+* rr/rebase-checkout-reflog (2013-06-17) 8 commits
23
+ - SQUASH???
24
+ - rebase -i: use a better reflog message
25
+ - rebase: use a better reflog message
26
+ - checkout: respect GIT_REFLOG_ACTION
27
+ - status: do not depend on rebase reflog messages
28
+ - t/t2021-checkout-last: "checkout -" should work after a rebase finishes
29
+ - wt-status: remove unused field in grab_1st_switch_cbdata
30
+ - t7512: test "detached from" as well
31
+
32
+ Invocations of "git checkout" used internally by "git rebase" were
33
+ counted as "checkout", and affected later "git checkout -" to the
34
+ the user to an unexpected place.
35
+
36
+ Waiting for a reroll.
37
+ $gmane/228271.
38
+
39
+
40
+* rr/rebase-stash-store (2013-06-17) 5 commits
41
+ - rebase: use 'git stash store' to simplify logic
42
+ - stash: introduce 'git stash store'
43
+ - stash: simplify option parser for create
44
+ - stash doc: document short form -p in synopsis
45
+ - stash doc: add a warning about using create
46
+
47
+ Finishing touches for the "git rebase --autostash" feature
48
+ introduced earlier.
49
50
Will merge to 'next'.
51
52
132
-* jh/libify-note-handling (2013-06-12) 3 commits
133
- - Move create_notes_commit() from notes-merge.c into notes-utils.c
134
- - Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
135
- - finish_copy_notes_for_rewrite(): Let caller provide commit message
53
+* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
54
+ - unpack-trees: don't shift conflicts left and right
55
56
+ Will merge to 'next'.
57
138
-* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
139
- - add--interactive: respect diff.algorithm
58
+
59
+* dk/maint-t5150-dirname (2013-06-17) 1 commit
60
+ - tests: allow sha1's as part of the path
61
62
Will merge to 'next'.
63
64
144
-* mh/ref-races (2013-06-11) 13 commits
145
- - refs: do not invalidate the packed-refs cache unnecessarily
146
- - for_each_ref: load all loose refs before packed refs
147
- - get_packed_ref_cache: reload packed-refs file when it changes
148
- - add a stat_validity struct
149
- - Extract a struct stat_data from cache_entry
150
- - packed_ref_cache: increment refcount when locked
151
- - do_for_each_entry(): increment the packed refs cache refcount
152
- - refs: manage lifetime of packed refs cache via reference counting
153
- - refs: implement simple transactions for the packed-refs file
154
- - refs: wrap the packed refs cache in a level of indirection
155
- - pack_refs(): split creation of packed refs and entry writing
156
- - repack_without_ref(): split list curation and entry writing
157
- - Merge branch 'mh/packed-refs-various' into mh/ref-races
65
+* dk/version-gen-gitdir (2013-06-17) 1 commit
66
+ - GIT-VERSION-GEN: support non-standard $GIT_DIR path
67
68
+ A comment and a counterproposal sent, which is queued here.
69
160
-* mm/rm-coalesce-errors (2013-06-12) 2 commits
161
- - rm: introduce advice.rmHints to shorten messages
162
- - rm: better error message on failure for multiple files
70
+ Will merge to 'next'.
71
72
165
-* rr/am-quit-empty-then-abort-fix (2013-06-14) 2 commits
166
- - SQUASH???
167
- - am: handle stray $dotest directory
73
+* fg/submodule-fixup (2013-06-17) 1 commit
74
+ - git-submodule.sh: remove duplicate call to set_rev_name
75
76
+ Will merge to 'next'.
77
170
-* rs/logical-vs-binary-or (2013-06-13) 1 commit
171
- (merged to 'next' on 2013-06-14 at 2821441)
172
- + use logical OR (||) instead of binary OR (|) in logical context
78
174
- Code cleanup.
79
+* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
80
+ - Documentation/Makefile: move infodir to be with other '*dir's
81
+ - Documentation/Makefile: fix spaces around assignments
82
176
- Will merge to 'master'.
83
+ Will merge to 'next'.
84
85
179
-* rs/match-trees-refactor (2013-06-13) 1 commit
180
- (merged to 'next' on 2013-06-14 at 1904928)
181
- + match-trees: factor out fill_tree_desc_strict
86
+* jk/mergetool-lib-refactor (2013-06-17) 1 commit
87
+ - mergetool--lib: refactor {diff,merge}_cmd logic
88
183
- Code cleanup.
89
+ Will merge to 'next'.
90
185
- Will merge to 'master'.
91
92
+* mm/push-force-is-dangerous (2013-06-18) 1 commit
93
+ - Documentation/git-push.txt: explain better cases where --force is dangerous
94
188
-* fg/submodule-non-ascii-path (2013-06-14) 1 commit
189
- - handle multibyte characters in name
95
+ Will merge to 'next'.
96
191
- Many "git submodule" operations do not work on a submodule at a
192
- path whose name is not in ASCII.
97
+
98
+* nk/config-local-doc (2013-06-17) 1 commit
99
+ - config: Add description of --local option
100
101
Will merge to 'next'.
102
103
197
-* rr/rebase-autostash (2013-06-13) 3 commits
198
- - rebase: finish_rebase() in noop rebase
199
- - rebase: finish_rebase() in fast-forward rebase
200
- - rebase: guard against missing files in read_basic_state()
104
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
105
+ - ### DONTMERGE: needs better explanation on what config they need
106
+ - pack-refs.c: Add missing call to git_config()
107
+ - show-ref.c: Add missing call to git_config()
108
+
109
+ The changes themselves are probably good, but it is unclear what
110
+ basic setting needs to be read for which exact operation.
111
+
112
+ Waiting for clarification.
113
+ $gmane/228294
114
+
115
+
116
+* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
117
+ - wt-status: give better advice when cherry-pick is in progress
118
119
Will merge to 'next'.
120
121
205
-* bp/remote-mw-tests (2013-06-14) 1 commit
206
- - git-remote-mediawiki: remove hardcoded version number in the test suite
122
+* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
123
+ - t/t9802: explicitly name the upstream branch to use as a base
124
+ - builtin/checkout.c: don't leak memory in check_tracking_name
125
126
Will merge to 'next'.
127
128
211
-* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
212
- - git-remote-mediawiki: make error message more precise
213
- - git-remote-mediawiki: add a perlcritic rule in Makefile
214
- - git-remote-mediawiki: add a .perlcriticrc file
215
- - git-remote-mediawiki: clearly rewrite double dereference
216
- - git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
217
- - git-remote-mediawiki: put non-trivial numeric values in constants.
218
- - git-remote-mediawiki: don't use quotes for empty strings
219
- - git-remote-mediawiki: replace "unless" statements with negated "if" statements
220
- - git-remote-mediawiki: brace file handles for print for more clarity
221
- - git-remote-mediawiki: modify strings for a better coding-style
222
- - git-remote-mediawiki: put long code into a subroutine
223
- - git-remote-mediawiki: remove import of unused open2
224
- - git-remote-mediawiki: check return value of open
225
- - git-remote-mediawiki: assign a variable as undef and make proper indentation
226
- - git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
227
- - git-remote-mediawiki: remove unused variable $entry
228
- - git-remote-mediawiki: turn double-negated expressions into simple expressions
229
- - git-remote-mediawiki: change the name of a variable
230
- - git-remote-mediawiki: add newline in the end of die() error messages
231
- - git-remote-mediawiki: change style in a regexp
232
- - git-remote-mediawiki: change style in a regexp
233
- - git-remote-mediawiki: change separator of some regexps
234
- - git-remote-mediawiki: change the behaviour of a split
235
- - git-remote-mediawiki: remove useless regexp modifier (m)
236
- - git-remote-mediawiki: rewrite unclear line of instructions
237
- - git-remote-mediawiki: change syntax of map calls
238
- - git-remote-mediawiki: move a variable declaration at the top of the code
239
- - git-remote-mediawiki: always end a subroutine with a return
240
- - git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
241
- - git-remote-mediawiki: move "use warnings;" before any instruction
242
- - git-remote-mediawiki: make a regexp clearer
129
+* kb/diff-blob-blob-doc (2013-06-18) 1 commit
130
+ - Documentation: Move "git diff <blob> <blob>"
131
132
Will merge to 'next'.
133
134
247
-* jk/apache-test-for-2.4 (2013-06-14) 4 commits
248
- - t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
249
- - t/lib-httpd/apache.conf: load compat access module in apache 2.4
250
- - t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
251
- - t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
135
+* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
136
+ - Documentation/git-merge.txt: weaken warning about uncommited changes
137
138
Will merge to 'next'.
139
140
256
-* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
257
- - rebase: use peel_committish() where appropriate
258
- - sh-setup: add new peel_committish() helper
259
- - t/rebase: add failing tests for a peculiar revision
141
+* mt/send-email-cc-match-fix (2013-06-18) 2 commits
142
+ - send-email: add test for duplicate utf8 name
143
+ - send-email: sanitize author when writing From line
144
+
145
+ Will merge to 'next'.
146
147
262
-* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
263
- - unpack_entry: do not die when we fail to apply a delta
264
- - t5303: drop "count=1" from corruption dd
148
+* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
149
+ - name-rev: allow to specify a subpath for --refs option
150
+
151
+ Will merge to 'next'.
152
+
153
+
154
+* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
155
+ - fix "builtin-*" references to be "builtin/*"
156
+
157
+ Will merge to 'next'.
158
159
--------------------------------------------------
160
[Stalled]
161
162
+* fc/contrib-related (2013-06-09) 5 commits
163
+ - contrib: related: print the amount of involvement
164
+ - contrib: related: parse committish like format-patch
165
+ - contrib: related: add option to parse from committish
166
+ - contrib: related: add support for multiple patches
167
+ - Add new git-related helper to contrib
168
+
169
+ Will discard.
170
+
171
+
172
+* hv/config-from-blob (2013-05-12) 5 commits
173
+ - do not die when error in config parsing of buf occurs
174
+ - teach config --blob option to parse config from database
175
+ - config: make parsing stack struct independent from actual data source
176
+ - config: drop cf validity check in get_next_char()
177
+ - config: factor out config file stack management
178
+
179
+ Waiting for a reroll.
180
+ $gmane/223964
181
+
182
+
183
* rr/triangle-push-fix (2013-06-09) 4 commits
184
- t/push-default: test pushdefault with all modes
185
- t/push-default: generalize test_push_{success, commit}
@@ -276,6 +190,7 @@ of the repositories listed at
190
triangular workflow where it does not quite apply.
191
192
Waiting for a reroll.
193
+ $gmane/227313
194
195
196
* jh/shorten-refname (2013-05-07) 4 commits
@@ -291,17 +206,7 @@ of the repositories listed at
206
"origin/something" and it already does).
207
208
Expecting a reroll, as an early part of a larger series.
294
-
295
-
296
-* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
297
- - submodule: fix quoting in relative_path()
298
- - submodule: drop the top-level requirement
299
- - rev-parse: add --prefix option
300
-
301
- Allow various subcommands of "git submodule" to be run not from the
302
- top of the working tree of the superproject.
303
-
304
- Waiting for a reroll.
209
+ $gmane/225137
210
211
212
* jl/submodule-mv (2013-04-23) 5 commits
@@ -316,6 +221,7 @@ of the repositories listed at
221
the .gitmodules file.
222
223
Waiting for a reroll.
224
+ $gmane/226294
225
226
227
* jk/list-objects-sans-blobs (2013-06-06) 4 commits
@@ -330,15 +236,6 @@ of the repositories listed at
236
Seems to break some tests in a trivial and obvious way.
237
238
333
-* jk/packed-refs-race (2013-05-06) 4 commits
334
- . for_each_ref: load all loose refs before packed refs
335
- . get_packed_refs: reload packed-refs file when it changes
336
- . add a stat_validity struct
337
- . resolve_ref: close race condition for packed refs
338
-
339
- Will be rerolled.
340
-
341
-
239
* mg/more-textconv (2013-05-10) 7 commits
240
- grep: honor --textconv for the case rev:path
241
- grep: allow to use textconv filters
@@ -352,7 +249,7 @@ of the repositories listed at
249
dealing with blob objects.
250
251
I thought this was pretty well designed and executed, but it seems
355
- there are some doubts on the list; kicking back to 'pu'.
252
+ there are some doubts on the list; kicked back to 'pu'.
253
254
255
* mh/multimail (2013-04-21) 1 commit
@@ -403,6 +300,181 @@ of the repositories listed at
300
--------------------------------------------------
301
[Cooking]
302
303
+* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
304
+ - submodule: drop the top-level requirement
305
+ - rev-parse: add --prefix option
306
+ - submodule: show full path in error message
307
+ - t7403: add missing && chaining
308
+ - t7403: modernize style
309
+ - t7401: make indentation consistent
310
+
311
+ Allow various subcommands of "git submodule" to be run not from the
312
+ top of the working tree of the superproject.
313
+
314
+ Will merge to 'next'.
315
+
316
+
317
+* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
318
+ (merged to 'next' on 2013-06-17 at 02957d8)
319
+ + prompt: squelch error output from cat
320
+
321
+ Will merge to 'master'.
322
+
323
+
324
+* jh/libify-note-handling (2013-06-12) 3 commits
325
+ - Move create_notes_commit() from notes-merge.c into notes-utils.c
326
+ - Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
327
+ - finish_copy_notes_for_rewrite(): Let caller provide commit message
328
+
329
+ Will merge to 'next'.
330
+
331
+
332
+* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
333
+ (merged to 'next' on 2013-06-17 at 48d5d4e)
334
+ + add--interactive: respect diff.algorithm
335
+
336
+ Will merge to 'master'.
337
+
338
+
339
+* mh/ref-races (2013-06-11) 13 commits
340
+ - refs: do not invalidate the packed-refs cache unnecessarily
341
+ - for_each_ref: load all loose refs before packed refs
342
+ - get_packed_ref_cache: reload packed-refs file when it changes
343
+ - add a stat_validity struct
344
+ - Extract a struct stat_data from cache_entry
345
+ - packed_ref_cache: increment refcount when locked
346
+ - do_for_each_entry(): increment the packed refs cache refcount
347
+ - refs: manage lifetime of packed refs cache via reference counting
348
+ - refs: implement simple transactions for the packed-refs file
349
+ - refs: wrap the packed refs cache in a level of indirection
350
+ - pack_refs(): split creation of packed refs and entry writing
351
+ - repack_without_ref(): split list curation and entry writing
352
+ - Merge branch 'mh/packed-refs-various' into mh/ref-races
353
+
354
+ Will merge to 'next'.
355
+
356
+
357
+* mm/rm-coalesce-errors (2013-06-12) 2 commits
358
+ - rm: introduce advice.rmHints to shorten messages
359
+ - rm: better error message on failure for multiple files
360
+
361
+ Will merge to 'next'.
362
+
363
+
364
+* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
365
+ - t/am: use test_path_is_missing() where appropriate
366
+ - am: handle stray $dotest directory
367
+
368
+ Will merge to 'next'.
369
+
370
+
371
+* rs/logical-vs-binary-or (2013-06-13) 1 commit
372
+ (merged to 'next' on 2013-06-14 at 2821441)
373
+ + use logical OR (||) instead of binary OR (|) in logical context
374
+
375
+ Code cleanup.
376
+
377
+ Will merge to 'master'.
378
+
379
+
380
+* rs/match-trees-refactor (2013-06-13) 1 commit
381
+ (merged to 'next' on 2013-06-14 at 1904928)
382
+ + match-trees: factor out fill_tree_desc_strict
383
+
384
+ Code cleanup.
385
+
386
+ Will merge to 'master'.
387
+
388
+
389
+* fg/submodule-non-ascii-path (2013-06-14) 1 commit
390
+ (merged to 'next' on 2013-06-17 at a0b9fa3)
391
+ + handle multibyte characters in name
392
+
393
+ Many "git submodule" operations do not work on a submodule at a
394
+ path whose name is not in ASCII.
395
+
396
+ Will merge to 'master'.
397
+
398
+
399
+* rr/rebase-autostash (2013-06-13) 3 commits
400
+ (merged to 'next' on 2013-06-17 at e692317)
401
+ + rebase: finish_rebase() in noop rebase
402
+ + rebase: finish_rebase() in fast-forward rebase
403
+ + rebase: guard against missing files in read_basic_state()
404
+
405
+ Will merge to 'master'.
406
+
407
+
408
+* bp/remote-mw-tests (2013-06-14) 1 commit
409
+ (merged to 'next' on 2013-06-17 at 2891373)
410
+ + git-remote-mediawiki: remove hardcoded version number in the test suite
411
+
412
+ Will merge to 'master'.
413
+
414
+
415
+* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
416
+ (merged to 'next' on 2013-06-17 at a41a924)
417
+ + git-remote-mediawiki: make error message more precise
418
+ + git-remote-mediawiki: add a perlcritic rule in Makefile
419
+ + git-remote-mediawiki: add a .perlcriticrc file
420
+ + git-remote-mediawiki: clearly rewrite double dereference
421
+ + git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
422
+ + git-remote-mediawiki: put non-trivial numeric values in constants.
423
+ + git-remote-mediawiki: don't use quotes for empty strings
424
+ + git-remote-mediawiki: replace "unless" statements with negated "if" statements
425
+ + git-remote-mediawiki: brace file handles for print for more clarity
426
+ + git-remote-mediawiki: modify strings for a better coding-style
427
+ + git-remote-mediawiki: put long code into a subroutine
428
+ + git-remote-mediawiki: remove import of unused open2
429
+ + git-remote-mediawiki: check return value of open
430
+ + git-remote-mediawiki: assign a variable as undef and make proper indentation
431
+ + git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
432
+ + git-remote-mediawiki: remove unused variable $entry
433
+ + git-remote-mediawiki: turn double-negated expressions into simple expressions
434
+ + git-remote-mediawiki: change the name of a variable
435
+ + git-remote-mediawiki: add newline in the end of die() error messages
436
+ + git-remote-mediawiki: change style in a regexp
437
+ + git-remote-mediawiki: change style in a regexp
438
+ + git-remote-mediawiki: change separator of some regexps
439
+ + git-remote-mediawiki: change the behaviour of a split
440
+ + git-remote-mediawiki: remove useless regexp modifier (m)
441
+ + git-remote-mediawiki: rewrite unclear line of instructions
442
+ + git-remote-mediawiki: change syntax of map calls
443
+ + git-remote-mediawiki: move a variable declaration at the top of the code
444
+ + git-remote-mediawiki: always end a subroutine with a return
445
+ + git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
446
+ + git-remote-mediawiki: move "use warnings;" before any instruction
447
+ + git-remote-mediawiki: make a regexp clearer
448
+
449
+ Will merge to 'master'.
450
+
451
+
452
+* jk/apache-test-for-2.4 (2013-06-14) 4 commits
453
+ (merged to 'next' on 2013-06-17 at 290e72e)
454
+ + t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
455
+ + t/lib-httpd/apache.conf: load compat access module in apache 2.4
456
+ + t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
457
+ + t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
458
+
459
+ Will merge to 'master'.
460
+
461
+
462
+* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
463
+ - rebase: use peel_committish() where appropriate
464
+ - sh-setup: add new peel_committish() helper
465
+ - t/rebase: add failing tests for a peculiar revision
466
+
467
+ Will merge to 'next'.
468
+
469
+
470
+* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
471
+ (merged to 'next' on 2013-06-17 at 89e0eab)
472
+ + unpack_entry: do not die when we fail to apply a delta
473
+ + t5303: drop "count=1" from corruption dd
474
+
475
+ Will merge to 'master'.
476
+
477
+
478
* jc/topo-author-date-sort (2013-06-11) 4 commits
479
(merged to 'next' on 2013-06-15 at ad4fb48)
480
+ log: --author-date-order
@@ -415,6 +487,8 @@ of the repositories listed at
487
output is topologically sorted and commits in parallel histories
488
are shown intermixed together based on the author timestamp.
489
490
+ Needs a test or two.
491
+
492
493
* fc/makefile (2013-06-09) 4 commits
494
(merged to 'next' on 2013-06-14 at 75b5f6b)
@@ -472,6 +546,8 @@ of the repositories listed at
546
- resolve_ref_unsafe(): handle the case of an SHA-1 within loop
547
- resolve_ref_unsafe(): extract function handle_missing_loose_ref()
548
549
+ Will merge to 'next'.
550
+
551
552
* jk/commit-info-slab (2013-06-07) 3 commits
553
(merged to 'next' on 2013-06-15 at 908ab93)
@@ -486,18 +562,11 @@ of the repositories listed at
562
Will merge to 'master'.
563
564
489
-* fc/sequencer-skip-quiet (2013-06-06) 5 commits
490
- - sequencer: run post-rewrite hook
491
- - cherry-pick: store rewritten commits
492
- - cherry-pick: add --skip-empty option
565
+* fc/sequencer-plug-leak (2013-06-06) 2 commits
566
- sequencer: avoid leaking message buffer when refusing to create an empty commit
567
- sequencer: remove useless indentation
568
496
- The bottom three looked more or less reasonable. Execution of
497
- post-rewrite hook could use a better refactoring from the original
498
- code copied from builtin/commit.c, though.
499
-
500
- Will discard the top 3, merge the rest to 'next'.
569
+ Will merge to 'next'.
570
571
572
* js/test-ln-s-add (2013-06-07) 10 commits
@@ -520,7 +589,9 @@ of the repositories listed at
589
Will merge to 'master'.
590
591
523
-* mz/rebase-tests (2013-06-07) 7 commits
592
+* mz/rebase-tests (2013-06-18) 8 commits
593
+ (merged to 'next' on 2013-06-18 at 12cfec8)
594
+ + rebase topology tests: fix commit names on case-insensitive file systems
595
(merged to 'next' on 2013-06-14 at 73f3318)
596
+ tests: move test for rebase messages from t3400 to t3406
597
+ t3406: modernize style
@@ -540,13 +611,18 @@ of the repositories listed at
611
Will merge to 'master'.
612
613
543
-* ap/diff-ignore-blank-lines (2013-06-10) 1 commit
614
+* ap/diff-ignore-blank-lines (2013-06-17) 1 commit
615
- diff: add --ignore-blank-lines option
616
617
"git diff" learned a mode that ignores hunks whose change consists
618
only of additions and removals of blank lines, which is the same as
619
"diff -B" (ignore blank lines) of GNU diff.
620
621
+ There still is a small bug.
622
+
623
+ Waiting for a reroll.
624
+ $gmane/228117
625
+
626
627
* jx/clean-interactive (2013-06-03) 15 commits
628
- test: add t7301 for git-clean--interactive
@@ -565,43 +641,26 @@ of the repositories listed at
641
- path.c: refactor relative_path(), not only strip prefix
642
- test: add test cases for relative_path
643
644
+ Waiting for a reroll.
645
+ $gmane/227710
646
+
647
569
-* tr/test-v-and-v-subtest-only (2013-05-16) 6 commits
648
+* tr/test-v-and-v-subtest-only (2013-06-18) 8 commits
649
- test-lib: support running tests under valgrind in parallel
650
- test-lib: allow prefixing a custom string before "ok N" etc.
651
- test-lib: valgrind for only tests matching a pattern
652
- test-lib: verbose mode for only tests matching a pattern
653
+ - test-lib: self-test that --verbose works
654
+ - test-lib: rearrange start/end of test_expect_* and test_skip
655
- test-lib: refactor $GIT_SKIP_TESTS matching
656
- test-lib: enable MALLOC_* for the actual tests
657
658
Allows N instances of tests run in parallel, each running 1/N parts
659
of the test suite under Valgrind, to speed things up.
660
580
- The tip one may be useful in practice but is a tad ugly ;-)
661
+ The tip two may be useful in practice but is a tad ugly ;-)
662
582
- There seem to be some miscounting by toggling the verbose/valgrind
583
- mode at wrong places? Cf. $gmane/225735
584
-
585
- Waiting for a reroll.
586
-
587
-
588
-* fc/contrib-related (2013-06-09) 5 commits
589
- - contrib: related: print the amount of involvement
590
- - contrib: related: parse committish like format-patch
591
- - contrib: related: add option to parse from committish
592
- - contrib: related: add support for multiple patches
593
- - Add new git-related helper to contrib
594
-
595
-
596
-* hv/config-from-blob (2013-05-12) 5 commits
597
- - do not die when error in config parsing of buf occurs
598
- - teach config --blob option to parse config from database
599
- - config: make parsing stack struct independent from actual data source
600
- - config: drop cf validity check in get_next_char()
601
- - config: factor out config file stack management
602
-
603
- Waiting for a reroll.
604
- $gmane/223964
663
+ Will merge to 'next'.
664
665
666
* mm/color-auto-default (2013-06-10) 2 commits
@@ -627,7 +686,7 @@ of the repositories listed at
686
Will cook in 'next' until Git 2.0.
687
688
630
-* jc/push-2.0-default-to-simple (2013-04-03) 1 commit
689
+* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
690
- push: switch default from "matching" to "simple"
691
692
Will cook in 'next' until Git 2.0.
@@ -666,3 +725,12 @@ of the repositories listed at
725
- remote-helpers: generate scripts
726
727
Retracted.
728
+
729
+
730
+* jk/packed-refs-race (2013-05-06) 4 commits
731
+ . for_each_ref: load all loose refs before packed refs
732
+ . get_packed_refs: reload packed-refs file when it changes
733
+ . add a stat_validity struct
734
+ . resolve_ref: close race condition for packed refs
735
+
736
+ Superseded by mh/ref-races topic, I think.