What's cooking (2013/01 #08)
Junio C Hamano committed
Jan 22, 2013 at 14:43 UTC
d93fe0c9db7e96a43313a1462322885c2b180573
1 file changed
+306
-257
whats-cooking.txt
+306
-257
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2013, #07; Thu, 17)
4
-X-master-at: eacf0117752780bf418d352a6ad2f033aeda1cce
5
-X-next-at: 99bfae2c22d58cfa0db9262c774d3f61a8d0dc1a
3
+Subject: What's cooking in git.git (Jan 2013, #08; Tue, 22)
4
+X-master-at: 9591fcc6d66fd213c8c9f73553b7684b73daf4cb
5
+X-next-at: 9bc26b8f63ccfb0316023621731bc14191a8b436
6
7
-What's cooking in git.git (Jan 2013, #07; Thu, 17)
7
+What's cooking in git.git (Jan 2013, #08; Tue, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -22,13 +22,126 @@ repositories listed at
22
--------------------------------------------------
23
[New Topics]
24
25
+* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit
26
+ - git-completion.bash: replace zsh notation that breaks bash 3.X
27
+
28
+ Fix use of an array notation that older versions of bash do not
29
+ understand.
30
+
31
+ Will merge to 'next'.
32
+
33
+
34
+* jc/help (2013-01-18) 1 commit
35
+ - help: include <common-cmds.h> only in one file
36
+
37
+ A header file that has the definition of a static array was
38
+ included in two places, wasting the space.
39
+
40
+ Will merge to 'next'.
41
+
42
+
43
+* jc/hidden-refs (2013-01-18) 2 commits
44
+ - upload-pack: allow hiding ref hiearchies
45
+ - upload-pack: share more code
46
+
47
+ Allow the server side to unclutter the refs/ namespace it shows by
48
+ default, while still allowing requests for histories leading to the
49
+ tips of hidden refs by updated clients (which are not written yet).
50
+
51
+
52
+* jk/update-install-for-p4 (2013-01-20) 1 commit
53
+ - INSTALL: git-p4 doesn't support Python 3
54
+
55
+ Will merge to 'next'.
56
+
57
+
58
+* tb/t0050-maint (2013-01-21) 3 commits
59
+ - t0050: Use TAB for indentation
60
+ - t0050: honor CASE_INSENSITIVE_FS in add (with different case)
61
+ - t0050: known breakage vanished in merge (case change)
62
+
63
+ Will merge to 'next'.
64
+
65
+
66
+* nd/magic-pathspec-from-root (2013-01-21) 2 commits
67
+ - grep: avoid accepting ambiguous revision
68
+ - Update :/abc ambiguity check
69
+
70
+ Will merge to 'next'.
71
+
72
+
73
+* ta/doc-no-small-caps (2013-01-21) 7 commits
74
+ - Add rule for when to use 'git' and when to use 'Git'
75
+ - Change 'git' to 'Git' whenever the whole system is referred to #4
76
+ - Change 'git' to 'Git' whenever the whole system is referred to #3
77
+ - Change 'git' to 'Git' whenever the whole system is referred to #2
78
+ - Change 'git' to 'Git' whenever the whole system is referred to #1
79
+ - Documentation: update two leftover small caps
80
+ - Documentation: avoid poor-man's small caps
81
+
82
+ Update documentation to change "GIT" which was a poor-man's small
83
+ caps to "Git" which was the intended spelling. Also change "git"
84
+ spelled in all-lowercase to "Git" when it refers to the system as
85
+ the whole or the concept it embodies, as opposed to the command the
86
+ end users would type.
87
+
88
+
89
+* rr/minimal-stat (2013-01-22) 1 commit
90
+ - Enable minimal stat checking
91
+
92
+ Some reimplementations of Git does not write all the stat info back
93
+ to the index due to their implementation limitations (e.g. jgit
94
+ running on Java). A configuration option can tell Git to ignore
95
+ changes to most of the stat fields and only pay attention to mtime
96
+ and size, which these implementations can reliably update. This
97
+ avoids excessive revalidation of contents.
98
+
99
+ Will merge to 'next'.
100
+
101
+--------------------------------------------------
102
+[Graduated to "master"]
103
+
104
+* ap/log-mailmap (2013-01-10) 11 commits
105
+ (merged to 'next' on 2013-01-10 at 8544084)
106
+ + log --use-mailmap: optimize for cases without --author/--committer search
107
+ + log: add log.mailmap configuration option
108
+ + log: grep author/committer using mailmap
109
+ + test: add test for --use-mailmap option
110
+ + log: add --use-mailmap option
111
+ + pretty: use mailmap to display username and email
112
+ + mailmap: add mailmap structure to rev_info and pp
113
+ + mailmap: simplify map_user() interface
114
+ + mailmap: remove email copy and length limitation
115
+ + Use split_ident_line to parse author and committer
116
+ + string-list: allow case-insensitive string list
117
+
118
+ Teach commands in the "log" family to optionally pay attention to
119
+ the mailmap.
120
+
121
+
122
+* ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit
123
+ (merged to 'next' on 2013-01-15 at 7542d21)
124
+ + git-completion.bash: silence "not a valid object" errors
125
+
126
+ An internal ls-tree call made by completion code only to probe if
127
+ a path exists in the tree recorded in a commit object leaked error
128
+ messages when the path is not there. It is not an error at all and
129
+ should not be shown to the end user.
130
+
131
+
132
* fc/remote-hg-fixup-url (2013-01-15) 1 commit
133
(merged to 'next' on 2013-01-15 at d2acb2d)
134
+ remote-hg: store converted URL
135
136
Update to the Hg remote helper (in contrib/).
137
31
- Will merge to 'master'.
138
+
139
+* jn/maint-trim-vim-contrib (2013-01-10) 1 commit
140
+ (merged to 'next' on 2013-01-15 at ad80a9d)
141
+ + contrib/vim: simplify instructions for old vim support
142
+
143
+ Remove stale insn to support older versions of vim and point users
144
+ to the upstream resources.
145
146
147
* mh/remote-hg-mode-bits-fix (2013-01-15) 1 commit
@@ -37,38 +150,41 @@ repositories listed at
150
151
Update to the Hg remote helper (in contrib/).
152
40
- Will merge to 'master'.
41
-
153
43
-* jc/valgrind-memcmp-bsearch (2013-01-14) 1 commit
44
- - ignore memcmp() overreading in bsearch() callback
45
-
46
- Squelch false positive in valgrind tests
47
-
48
- Will discard.
154
+* mk/complete-tcsh (2013-01-07) 1 commit
155
+ (merged to 'next' on 2013-01-11 at b8b30b1)
156
+ + Prevent space after directories in tcsh completion
157
158
+ Update tcsh command line completion so that an unwanted space is
159
+ not added to a single directory name.
160
51
-* mh/imap-send-shrinkage (2013-01-15) 14 commits
52
- - imap-send.c: simplify logic in lf_to_crlf()
53
- - imap-send.c: fold struct store into struct imap_store
54
- - imap-send.c: remove unused field imap_store::uidvalidity
55
- - imap-send.c: use struct imap_store instead of struct store
56
- - imap-send.c: remove unused field imap_store::trashnc
57
- - imap-send.c: remove namespace fields from struct imap
58
- - imap-send.c: remove struct imap argument to parse_imap_list_l()
59
- - imap-send.c: inline parse_imap_list() in parse_list()
60
- - imap-send.c: remove some unused fields from struct store
61
- - imap-send.c: remove struct message
62
- - imap-send.c: remove struct store_conf
63
- - iamp-send.c: remove unused struct imap_store_conf
64
- - imap-send.c: remove struct msg_data
65
- - imap-send.c: remove msg_data::flags, which was always zero
161
67
- Remove a lot of unused code from "git imap-send".
162
+* mz/reset-misc (2013-01-16) 20 commits
163
+ (merged to 'next' on 2013-01-16 at 937bc20)
164
+ + reset: update documentation to require only tree-ish with paths
165
+ (merged to 'next' on 2013-01-15 at a93b394)
166
+ + reset [--mixed]: use diff-based reset whether or not pathspec was given
167
+ + reset: allow reset on unborn branch
168
+ + reset $sha1 $pathspec: require $sha1 only to be treeish
169
+ + reset.c: inline update_index_refresh()
170
+ + reset.c: finish entire cmd_reset() whether or not pathspec is given
171
+ + reset [--mixed]: only write index file once
172
+ + reset.c: move lock, write and commit out of update_index_refresh()
173
+ + reset.c: move update_index_refresh() call out of read_from_tree()
174
+ + reset.c: replace switch by if-else
175
+ + reset: avoid redundant error message
176
+ + reset --keep: only write index file once
177
+ + reset.c: share call to die_if_unmerged_cache()
178
+ + reset.c: extract function for updating {ORIG_,}HEAD
179
+ + reset.c: remove unnecessary variable 'i'
180
+ + reset.c: extract function for parsing arguments
181
+ + reset: don't allow "git reset -- $pathspec" in bare repo
182
+ + reset.c: pass pathspec around instead of (prefix, argv) pair
183
+ + reset $pathspec: exit with code 0 if successful
184
+ + reset $pathspec: no need to discard index
185
69
- With a further comment fixup in patch #6, this seems ready for
70
- 'next'.
71
- Expecting a reroll.
186
+ Various 'reset' optimizations and clean-ups, followed by a change
187
+ to allow "git reset" to work even on an unborn branch.
188
189
190
* nd/attr-debug-fix (2013-01-15) 1 commit
@@ -77,7 +193,12 @@ repositories listed at
193
194
Fix debugging support that was broken in earlier change.
195
80
- Will merge to 'master'.
196
+
197
+* nd/clone-no-separate-git-dir-with-bare (2013-01-10) 1 commit
198
+ (merged to 'next' on 2013-01-15 at 64f441a)
199
+ + clone: forbid --bare --separate-git-dir <dir>
200
+
201
+ Forbid a useless combination of options to "git clone".
202
203
204
* nd/fix-directory-attrs-off-by-one (2013-01-16) 2 commits
@@ -89,8 +210,6 @@ repositories listed at
210
Fix performance regression introduced by an earlier change to let
211
attributes apply to directories.
212
92
- Will merge to 'master'.
93
-
213
214
* nd/fix-perf-parameters-in-tests (2013-01-15) 1 commit
215
(merged to 'next' on 2013-01-15 at fedbdb9)
@@ -99,7 +218,25 @@ repositories listed at
218
Allow GIT_PERF_* environment variables to be passed through the
219
test framework.
220
102
- Will merge to 'master'.
221
+
222
+* pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit
223
+ (merged to 'next' on 2013-01-14 at 6b4d555)
224
+ + git-commit-tree(1): correct description of defaults
225
+
226
+ In the precedence order, the environment variable $EMAIL comes
227
+ between the built-in default (i.e. taking value by asking the
228
+ system's gethostname() etc.) and the user.email configuration
229
+ variable; the documentation implied that it is stronger than the
230
+ configuration like $GIT_COMMITTER_EMAIL is, which is wrong.
231
+
232
+
233
+* ph/rebase-preserve-all-merges (2013-01-14) 1 commit
234
+ (merged to 'next' on 2013-01-15 at 3a67878)
235
+ + rebase --preserve-merges: keep all merge commits including empty ones
236
+
237
+ An earlier change to add --keep-empty option broke "git rebase
238
+ --preserve-merges" and lost merge commits that end up being the
239
+ same as its parent.
240
241
242
* pw/p4-branch-fixes (2013-01-15) 14 commits
@@ -121,73 +258,35 @@ repositories listed at
258
259
Fix "git p4" around branch handling.
260
124
- Will merge to 'master'.
125
-
126
-
127
-* ss/help-htmlpath-config-doc (2013-01-15) 1 commit
128
- (merged to 'next' on 2013-01-17 at 99bfae2)
129
- + config.txt: Document help.htmlpath config parameter
261
131
- Add missing doc.
132
-
133
- Will merge to 'master'.
134
-
135
-
136
-* cr/push-force-tag-update (2013-01-16) 1 commit
137
- - push: fix "refs/tags/ hierarchy cannot be updated without --force"
138
-
139
- Regression fix.
140
-
141
- Will merge to 'next' and then to 'master' soonish.
142
-
143
-
144
-* jk/suppress-clang-warning (2013-01-16) 1 commit
145
- - fix clang -Wunused-value warnings for error functions
146
-
147
- Will merge to 'next'.
148
-
149
-
150
-* rs/clarify-entry-cmp-sslice (2013-01-16) 1 commit
151
- - refs: use strncmp() instead of strlen() and memcmp()
152
-
153
- Will merge to 'next'.
154
-
155
-
156
-* ch/add-auto-submitted-in-sample-post-receive-email (2013-01-17) 1 commit
157
- - Add Auto-Submitted header to post-receive-email
158
-
159
- Will merge to 'next'.
262
+* rs/pretty-use-prefixcmp (2013-01-14) 1 commit
263
+ (merged to 'next' on 2013-01-15 at d76452d)
264
+ + pretty: use prefixcmp instead of memcmp on NUL-terminated strings
265
266
162
-* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
163
- - simplify-merges: drop merge from irrelevant side branch
267
+* rt/commit-cleanup-config (2013-01-10) 1 commit
268
+ (merged to 'next' on 2013-01-15 at c4742ae)
269
+ + commit: make default of "cleanup" option configurable
270
165
- The --simplify-merges logic did not cull irrelevant parents from a
166
- merge that is otherwise not interesting with respect to the paths
167
- we are following.
271
+ Add a configuration variable to set default clean-up mode other
272
+ than "strip".
273
169
- As this touches a fairly core part of the revision traversal
170
- infrastructure, it is appreciated to have an extra set of eyes for
171
- sanity check.
274
173
- Waiting for comments.
275
+* ss/help-htmlpath-config-doc (2013-01-15) 1 commit
276
+ (merged to 'next' on 2013-01-17 at 99bfae2)
277
+ + config.txt: Document help.htmlpath config parameter
278
279
+ Add missing doc.
280
176
-* jk/remote-helpers-in-python-3 (2013-01-17) 8 commits
177
- - git-remote-testpy: call print as a function
178
- - git-remote-testpy: don't do unbuffered text I/O
179
- - git-remote-testpy: hash bytes explicitly
180
- - svn-fe: allow svnrdump_sim.py to run with Python 3
181
- - git_remote_helpers: use 2to3 if building with Python 3
182
- - git_remote_helpers: force rebuild if python version changes
183
- - git_remote_helpers: fix input when running under Python 3
184
- - git_remote_helpers: allow building with Python 3
281
186
- Except for one instance of <user-generated-string>.encode('utf-8'),
187
- nothing looked wrong. People who have worked on git_remote_helpers
188
- should review and Ack, though.
282
+* zk/clean-report-failure (2013-01-14) 1 commit
283
+ (merged to 'next' on 2013-01-15 at 5b31614)
284
+ + git-clean: Display more accurate delete messages
285
190
- Waiting for further comments.
286
+ "git clean" states what it is going to remove and then goes on to
287
+ remove it, but sometimes it only discovers things that cannot be
288
+ removed after recursing into a directory, which makes the output
289
+ confusing and even wrong.
290
291
--------------------------------------------------
292
[Stalled]
@@ -300,6 +399,92 @@ repositories listed at
399
--------------------------------------------------
400
[Cooking]
401
402
+* mh/imap-send-shrinkage (2013-01-15) 14 commits
403
+ (merged to 'next' on 2013-01-18 at 1b7c5ba)
404
+ + imap-send.c: simplify logic in lf_to_crlf()
405
+ + imap-send.c: fold struct store into struct imap_store
406
+ + imap-send.c: remove unused field imap_store::uidvalidity
407
+ + imap-send.c: use struct imap_store instead of struct store
408
+ + imap-send.c: remove unused field imap_store::trashnc
409
+ + imap-send.c: remove namespace fields from struct imap
410
+ + imap-send.c: remove struct imap argument to parse_imap_list_l()
411
+ + imap-send.c: inline parse_imap_list() in parse_list()
412
+ + imap-send.c: remove some unused fields from struct store
413
+ + imap-send.c: remove struct message
414
+ + imap-send.c: remove struct store_conf
415
+ + iamp-send.c: remove unused struct imap_store_conf
416
+ + imap-send.c: remove struct msg_data
417
+ + imap-send.c: remove msg_data::flags, which was always zero
418
+
419
+ Remove a lot of unused code from "git imap-send".
420
+
421
+ Will merge to 'master'.
422
+
423
+
424
+* cr/push-force-tag-update (2013-01-21) 4 commits
425
+ - push: further simplify the logic to assign rejection status
426
+ - push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
427
+ - push: further clean up fields of "struct ref"
428
+ (merged to 'next' on 2013-01-18 at c9091d5)
429
+ + push: fix "refs/tags/ hierarchy cannot be updated without --force"
430
+
431
+ Regression fix (the bottom one), and error/advice message
432
+ improvements (the rest).
433
+
434
+ Will merge to 'master' the bottom one soonish.
435
+ The remainder can cook in 'next' like any other topic.
436
+
437
+
438
+* jk/suppress-clang-warning (2013-01-16) 1 commit
439
+ (merged to 'next' on 2013-01-18 at 7c0bda7)
440
+ + fix clang -Wunused-value warnings for error functions
441
+
442
+ Will merge to 'master'.
443
+
444
+
445
+* rs/clarify-entry-cmp-sslice (2013-01-16) 1 commit
446
+ (merged to 'next' on 2013-01-18 at d584dc6)
447
+ + refs: use strncmp() instead of strlen() and memcmp()
448
+
449
+ Will merge to 'master'.
450
+
451
+
452
+* ch/add-auto-submitted-in-sample-post-receive-email (2013-01-17) 1 commit
453
+ (merged to 'next' on 2013-01-18 at e3205db)
454
+ + Add Auto-Submitted header to post-receive-email
455
+
456
+ Will merge to 'master'.
457
+
458
+
459
+* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
460
+ - simplify-merges: drop merge from irrelevant side branch
461
+
462
+ The --simplify-merges logic did not cull irrelevant parents from a
463
+ merge that is otherwise not interesting with respect to the paths
464
+ we are following.
465
+
466
+ As this touches a fairly core part of the revision traversal
467
+ infrastructure, it is appreciated to have an extra set of eyes for
468
+ sanity check.
469
+
470
+ Waiting for comments.
471
+
472
+
473
+* jk/remote-helpers-in-python-3 (2013-01-20) 8 commits
474
+ - git-remote-testpy: call print as a function
475
+ - git-remote-testpy: don't do unbuffered text I/O
476
+ - git-remote-testpy: hash bytes explicitly
477
+ - svn-fe: allow svnrdump_sim.py to run with Python 3
478
+ - git_remote_helpers: use 2to3 if building with Python 3
479
+ - git_remote_helpers: force rebuild if python version changes
480
+ - git_remote_helpers: fix input when running under Python 3
481
+ - git_remote_helpers: allow building with Python 3
482
+
483
+ Prepare remote-helper test written in Python to be run with Python3.
484
+
485
+ Will merge to 'next'.
486
+
487
+
488
* jc/cvsimport-upgrade (2013-01-14) 8 commits
489
- t9600: adjust for new cvsimport
490
- t9600: further prepare for sharing
@@ -320,36 +505,30 @@ repositories listed at
505
old one in due time" strategy that we used successfully in the
506
past.
507
323
- Both folks on the Git side and Chris Rorvick (contributor to cvsps
324
- 3.0 and new cvsimport) seem happy with the new layout, so let's
325
- wait for a few days to see how it evolves and merge it to 'next'.
326
-
327
- Waiting for Eric to say something, but otherwise will merge to 'next'.
508
+ Will merge to 'next'.
509
510
330
-* as/pre-push-hook (2013-01-14) 4 commits
331
- - Add sample pre-push hook script
332
- - [SQUASH???] t5571 sample hooks should consume their input
333
- - push: Add support for pre-push hooks
334
- - hooks: Add function to check if a hook exists
511
+* as/pre-push-hook (2013-01-18) 3 commits
512
+ (merged to 'next' on 2013-01-18 at 37fc4e8)
513
+ + Add sample pre-push hook script
514
+ + push: Add support for pre-push hooks
515
+ + hooks: Add function to check if a hook exists
516
517
Add an extra hook so that "git push" that is run without making
518
sure what is being pushed is sane can be checked and rejected (as
519
opposed to the user deciding not pushing).
520
340
- Will merge to 'next' after squashing the fix in.
521
+ Will merge to 'master'.
522
523
343
-* dl/am-hg-locale (2013-01-14) 1 commit
524
+* dl/am-hg-locale (2013-01-18) 1 commit
525
- am: invoke perl's strftime in C locale
526
527
Datestamp recorded in "Hg" format patch was reformatted incorrectly
528
to an e-mail looking date using locale dependant strftime, causing
529
patch application to fail.
530
350
- This is an original "everything in C locale" version; the later one
351
- that uses LC_TIME may technically be more correct, so I may replace
352
- this with it later ($gmane/213660).
531
+ Will merge to 'next'.
532
533
534
* jk/config-parsing-cleanup (2013-01-14) 7 commits
@@ -375,16 +554,7 @@ repositories listed at
554
Looking better; may want tests to protect it from future breakages,
555
but otherwise it looks ready for 'next'.
556
378
-
379
-* ph/rebase-preserve-all-merges (2013-01-14) 1 commit
380
- (merged to 'next' on 2013-01-15 at 3a67878)
381
- + rebase --preserve-merges: keep all merge commits including empty ones
382
-
383
- An earlier change to add --keep-empty option broke "git rebase
384
- --preserve-merges" and lost merge commits that end up being the
385
- same as its parent.
386
-
387
- Will merge to 'master'.
557
+ Waiting for a follow-up to add tests.
558
559
560
* rs/archive-tar-config-parsing-fix (2013-01-14) 1 commit
@@ -394,22 +564,7 @@ repositories listed at
564
broken; Peff's config parsing clean-up topic will address the same
565
breakage, so this may be superseded by that other topic.
566
397
-
398
-* rs/pretty-use-prefixcmp (2013-01-14) 1 commit
399
- (merged to 'next' on 2013-01-15 at d76452d)
400
- + pretty: use prefixcmp instead of memcmp on NUL-terminated strings
401
-
402
- Will merge to 'master'.
403
-
404
-
405
-* rt/commit-cleanup-config (2013-01-10) 1 commit
406
- (merged to 'next' on 2013-01-15 at c4742ae)
407
- + commit: make default of "cleanup" option configurable
408
-
409
- Add a configuration variable to set default clean-up mode other
410
- than "strip".
411
-
412
- Will merge to 'master'.
567
+ Waiting for the other topic to make this unneeded.
568
569
570
* jc/custom-comment-char (2013-01-16) 1 commit
@@ -427,69 +582,7 @@ repositories listed at
582
583
I don't know how useful this will be in real life, though.
584
430
- Waiting for bug reports and user feedback.
431
-
432
-
433
-* jn/maint-trim-vim-contrib (2013-01-10) 1 commit
434
- (merged to 'next' on 2013-01-15 at ad80a9d)
435
- + contrib/vim: simplify instructions for old vim support
436
-
437
- Will merge to 'master'.
438
-
439
-
440
-* mz/reset-misc (2013-01-16) 20 commits
441
- (merged to 'next' on 2013-01-16 at 937bc20)
442
- + reset: update documentation to require only tree-ish with paths
443
- (merged to 'next' on 2013-01-15 at a93b394)
444
- + reset [--mixed]: use diff-based reset whether or not pathspec was given
445
- + reset: allow reset on unborn branch
446
- + reset $sha1 $pathspec: require $sha1 only to be treeish
447
- + reset.c: inline update_index_refresh()
448
- + reset.c: finish entire cmd_reset() whether or not pathspec is given
449
- + reset [--mixed]: only write index file once
450
- + reset.c: move lock, write and commit out of update_index_refresh()
451
- + reset.c: move update_index_refresh() call out of read_from_tree()
452
- + reset.c: replace switch by if-else
453
- + reset: avoid redundant error message
454
- + reset --keep: only write index file once
455
- + reset.c: share call to die_if_unmerged_cache()
456
- + reset.c: extract function for updating {ORIG_,}HEAD
457
- + reset.c: remove unnecessary variable 'i'
458
- + reset.c: extract function for parsing arguments
459
- + reset: don't allow "git reset -- $pathspec" in bare repo
460
- + reset.c: pass pathspec around instead of (prefix, argv) pair
461
- + reset $pathspec: exit with code 0 if successful
462
- + reset $pathspec: no need to discard index
463
-
464
- Various 'reset' optimizations and clean-ups, followed by a change
465
- to allow "git reset" to work even on an unborn branch.
466
-
467
- Will merge to 'master'.
468
-
469
-
470
-* pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit
471
- (merged to 'next' on 2013-01-14 at 6b4d555)
472
- + git-commit-tree(1): correct description of defaults
473
-
474
- In the precedence order, the environment variable $EMAIL comes
475
- between the built-in default (i.e. taking value by asking the
476
- system's gethostname() etc.) and the user.email configuration
477
- variable; the documentation implied that it is stronger than the
478
- configuration like $GIT_COMMITTER_EMAIL is, which is wrong.
479
-
480
- Will merge to 'master'.
481
-
482
-
483
-* ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit
484
- (merged to 'next' on 2013-01-15 at 7542d21)
485
- + git-completion.bash: silence "not a valid object" errors
486
-
487
- An internal ls-tree call made by completion code only to probe if
488
- a path exists in the tree recorded in a commit object leaked error
489
- messages when the path is not there. It is not an error at all and
490
- should not be shown to the end user.
491
-
492
- Will merge to 'master'.
585
+ Will merge to 'next'.
586
587
588
* nd/fetch-depth-is-broken (2013-01-11) 3 commits
@@ -518,16 +611,6 @@ repositories listed at
611
Will cook in 'next'.
612
613
521
-* mk/complete-tcsh (2013-01-07) 1 commit
522
- (merged to 'next' on 2013-01-11 at b8b30b1)
523
- + Prevent space after directories in tcsh completion
524
-
525
- Update tcsh command line completion so that an unwanted space is
526
- not added to a single directory name.
527
-
528
- Will merge to 'master'.
529
-
530
-
614
* dg/subtree-fixes (2013-01-08) 7 commits
615
- contrib/subtree: mkdir the manual directory if needed
616
- contrib/subtree: honor $(DESTDIR)
@@ -543,26 +626,6 @@ repositories listed at
626
Expecting a reroll.
627
628
546
-* ap/log-mailmap (2013-01-10) 11 commits
547
- (merged to 'next' on 2013-01-10 at 8544084)
548
- + log --use-mailmap: optimize for cases without --author/--committer search
549
- + log: add log.mailmap configuration option
550
- + log: grep author/committer using mailmap
551
- + test: add test for --use-mailmap option
552
- + log: add --use-mailmap option
553
- + pretty: use mailmap to display username and email
554
- + mailmap: add mailmap structure to rev_info and pp
555
- + mailmap: simplify map_user() interface
556
- + mailmap: remove email copy and length limitation
557
- + Use split_ident_line to parse author and committer
558
- + string-list: allow case-insensitive string list
559
-
560
- Teach commands in the "log" family to optionally pay attention to
561
- the mailmap.
562
-
563
- Will merge to 'master'.
564
-
565
-
629
* jc/push-2.0-default-to-simple (2013-01-16) 14 commits
630
(merged to 'next' on 2013-01-16 at 23f5df2)
631
+ t5570: do not assume the "matching" push is the default
@@ -584,15 +647,6 @@ repositories listed at
647
Will cook in 'next' until Git 2.0 ;-).
648
649
587
-* nd/clone-no-separate-git-dir-with-bare (2013-01-10) 1 commit
588
- (merged to 'next' on 2013-01-15 at 64f441a)
589
- + clone: forbid --bare --separate-git-dir <dir>
590
-
591
- Forbid a useless combination of options to "git clone".
592
-
593
- Will merge to 'master'.
594
-
595
-
650
* nd/parse-pathspec (2013-01-11) 20 commits
651
. Convert more init_pathspec() to parse_pathspec()
652
. Convert add_files_to_cache to take struct pathspec
@@ -654,11 +708,12 @@ repositories listed at
708
709
Various git-cvsserver updates.
710
657
- Will cook in 'next' for a while to see if anybody screams.
711
+ Will merge to 'master'.
712
713
714
* as/check-ignore (2013-01-16) 13 commits
661
- - clean.c, ls-files.c: respect encapsulation of exclude_list_groups
715
+ (merged to 'next' on 2013-01-18 at ef45aff)
716
+ + clean.c, ls-files.c: respect encapsulation of exclude_list_groups
717
(merged to 'next' on 2013-01-14 at 9df2afc)
718
+ t0008: avoid brace expansion
719
+ add git-check-ignore sub-command
@@ -679,7 +734,7 @@ repositories listed at
734
The variable names may want to get cleaned up but that can be done
735
in-tree.
736
682
- Will merge to 'next'.
737
+ Will merge to 'master'.
738
739
740
* nd/retire-fnmatch (2013-01-01) 7 commits
@@ -698,7 +753,7 @@ repositories listed at
753
A handful patches at the bottom have been moved to nd/wildmatch to
754
graduate as part of that branch, before this series solidifies.
755
701
- Will cook in 'next' a bit longer than other topics.
756
+ Will merge to 'master'.
757
758
759
* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
@@ -708,23 +763,9 @@ repositories listed at
763
$gmane/211935
764
765
711
-* zk/clean-report-failure (2013-01-14) 1 commit
712
- (merged to 'next' on 2013-01-15 at 5b31614)
713
- + git-clean: Display more accurate delete messages
714
-
715
- "git clean" states what it is going to remove and then goes on to
716
- remove it, but sometimes it only discovers things that cannot be
717
- removed after recursing into a directory, which makes the output
718
- confusing and even wrong.
719
-
720
- Will merge to 'master'.
721
-
722
-
723
-* bc/append-signed-off-by (2013-01-01) 12 commits
724
- - t4014: do not use echo -n
766
+* bc/append-signed-off-by (2013-01-21) 10 commits
767
- Unify appending signoff in format-patch, commit and sequencer
768
- format-patch: update append_signoff prototype
727
- - format-patch: stricter S-o-b detection
769
- t4014: more tests about appending s-o-b lines
770
- sequencer.c: teach append_signoff to avoid adding a duplicate newline
771
- sequencer.c: teach append_signoff how to detect duplicate s-o-b
@@ -734,8 +775,9 @@ repositories listed at
775
- t/test-lib-functions.sh: allow to specify the tag name to test_commit
776
- sequencer.c: remove broken support for rfc2822 continuation in footer
777
737
- Expecting a reroll.
738
- $gmane/212507
778
+ Rerolled.
779
+
780
+ Seems that we will see another round.
781
782
--------------------------------------------------
783
[Discarded]
@@ -750,3 +792,10 @@ repositories listed at
792
. cvsimport: rewrite to use cvsps 3.x to fix major bugs
793
794
Rerolled as jc/cvsimport-upgrade.
795
+
796
+
797
+* jc/valgrind-memcmp-bsearch (2013-01-14) 1 commit
798
+ . ignore memcmp() overreading in bsearch() callback
799
+
800
+ Squelch false positive in valgrind tests; made unnecessary by
801
+ rewriting the callsite that confuses the tool.