What's cooking (2013/01 #02)
Junio C Hamano committed
Jan 3, 2013 at 11:10 UTC
d7b12b0c7b3827b470148cefe2cde32d73684f93
1 file changed
+407
-404
whats-cooking.txt
+407
-404
@@ -1,27 +1,23 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2013, #01; Tue, 1)
4
-X-master-at: 5d417842efeafb6e109db7574196901c4e95d273
5
-X-next-at: 8c633a54c4512b0a738750d9713cb0b5370100ba
3
+Subject: What's cooking in git.git (Jan 2013, #02; Thu, 3)
4
+X-master-at: 3e293fba627e254b2c7d196bb7563c6c9d2e6f8a
5
+X-next-at: 64b3e71d071ea592b3e4e52272e50cf5909226b6
6
7
-What's cooking in git.git (Jan 2013, #01; Tue, 1)
7
+What's cooking in git.git (Jan 2013, #02; Thu, 3)
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
-The tip of the 'master' branch is at 1.8.1; the tip of 'next' will
15
-be rewound soonish to reorder topics that are already well cooked
16
-during the pre-release freeze earlier than the others so that they
17
-can orderly be merged to 'master' after the dust settles, probably
18
-towards the end of this week.
14
+The post 1.8.1 cycle has started, and about a dozen topics (mostly
15
+fixes) have graduated to the 'master' branch. The second batch will
16
+follow shortly.
17
20
-Note that many topics that have been marked as "Will cook in next"
21
-have been recategorized to be merged to 'master' soonish, and a few
22
-topics have been marked to be kicked back to 'pu'. Please holler if
23
-a topic that still has unresolved issues is marked to be merged to
24
-'master' by mistake.
18
+As usual, this cycle is expected to last for 8 to 10 weeks. To
19
+ensure the quality of the end result, let's merge topics in flight
20
+earlier than previous cycles to 'next' and fix issues in-tree.
21
22
You can find the changes described here in the integration branches of the
23
repositories listed at
@@ -31,39 +27,258 @@ repositories listed at
27
--------------------------------------------------
28
[New Topics]
29
34
-* jc/submittingpatches (2013-01-01) 3 commits
35
- - SubmittingPatches: remove overlong checklist
36
- - SubmittingPatches: mention subsystems with dedicated repositories
37
- - SubmittingPatches: who am I and who cares?
30
+* jn/less-reconfigure (2013-01-02) 1 commit
31
+ (merged to 'next' on 2013-01-02 at e5cd6cf)
32
+ + build: do not automatically reconfigure unless configure.ac changed
33
39
- Will reroll.
34
+ When autoconf is used, any build on a different commit always ran
35
+ "config.status --recheck" even when unnecessary.
36
37
42
-* kb/maint-bundle-doc (2013-01-01) 2 commits
43
- - Documentation: full-ness of a bundle is significant for cloning
44
- - Documentation: correct example restore from bundle
38
+* ap/merge-stop-at-prepare-commit-msg-failure (2013-01-03) 1 commit
39
+ - merge: Honor prepare-commit-msg return code
40
+
41
+ "git merge" started calling prepare-commit-msg hook like "git
42
+ commit" does some time ago, but forgot to pay attention to the exit
43
+ status of the hook. t7505 may want a general clean-up but that is
44
+ a different topic.
45
46
Will merge to 'next'.
47
48
49
-* nd/maint-branch-desc-doc (2013-01-01) 3 commits
50
- - branch: delete branch description if it's empty
51
- - format-patch: pick up branch description when no ref is specified
52
- - config.txt: a few lines about branch.<name>.description
49
+* tb/test-shell-lint (2013-01-02) 1 commit
50
+ - test: Add check-non-portable-shell.pl
51
+
52
+ Check for common mistakes in the test scripts, based on simple
53
+ pattern-matching.
54
54
- Waiting for a reroll.
55
+ Will merge to 'next'.
56
57
57
-* tb/test-t9020-no-which (2013-01-01) 1 commit
58
- - t9020: which is not portable
58
+* jk/enable-test-lint-by-default (2013-01-03) 1 commit
59
+ - tests: turn on test-lint by default
60
+
61
+ We had two simple and quick tests to catch common mistakes when
62
+ writing test scripts, but they weren't run by default when running
63
+ tests.
64
65
Will merge to 'next'.
66
67
+--------------------------------------------------
68
+[Graduated to "master"]
69
63
-* tb/test-t9810-no-sed-i (2013-01-01) 1 commit
64
- - t9810: Do not use sed -i
70
+* as/test-tweaks (2012-12-20) 7 commits
71
+ (merged to 'next' on 2012-12-22 at 7312c6c)
72
+ + tests: paint unexpectedly fixed known breakages in bold red
73
+ + tests: test the test framework more thoroughly
74
+ + tests: refactor mechanics of testing in a sub test-lib
75
+ + tests: change info messages from yellow/brown to cyan
76
+ + tests: paint skipped tests in blue
77
+ + tests: paint known breakages in yellow
78
+ + tests: test number comes first in 'not ok $count - $message'
79
66
- Will merge to 'next'.
80
+ Output from the tests is coloured using "green is okay, yellow is
81
+ questionable, red is bad and blue is informative" scheme.
82
+
83
+
84
+* da/p4merge-mktemp (2012-12-26) 1 commit
85
+ (merged to 'next' on 2012-12-26 at 036938a)
86
+ + mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
87
+
88
+ Create an empty file in $TMPDIR instead of using an empty file in
89
+ the local directory.
90
+
91
+
92
+* dm/port (2012-12-19) 4 commits
93
+ (merged to 'next' on 2012-12-22 at 8adc198)
94
+ + git-compat-util.h: do not #include <sys/param.h> by default
95
+ + Generalize the inclusion of strings.h
96
+ + Detect when the passwd struct is missing pw_gecos
97
+ + Support builds when sys/param.h is missing
98
+ (this branch is used by mk/qnx.)
99
+
100
+ Add a few more knobs for new platform ports can tweak.
101
+
102
+
103
+* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
104
+ (merged to 'next' on 2012-12-11 at 6659fdc)
105
+ + sh-setup: work around "unset IFS" bug in some shells
106
+
107
+ Some shells do not behave correctly when IFS is unset; work it
108
+ around by explicitly setting it to the default value.
109
+
110
+
111
+* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit
112
+ (merged to 'next' on 2012-12-22 at 540df2c)
113
+ + compat/fnmatch: update old-style definition to ANSI
114
+
115
+ Update old-style function definition "int foo(bar) int bar; {}"
116
+ to "int foo(int bar) {}".
117
+
118
+
119
+* jc/maint-test-portability (2012-12-19) 3 commits
120
+ (merged to 'next' on 2012-12-22 at daeed53)
121
+ + t4014: fix arguments to grep
122
+ + t9502: do not assume GNU tar
123
+ + t0200: "locale" may not exist
124
+ (this branch is used by jc/test-portability.)
125
+
126
+ Minor test fixes noticed while running our tests on OpenBSD 5.2,
127
+ applicable to 'maint'.
128
+
129
+
130
+* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit
131
+ (merged to 'next' on 2012-12-22 at 18cdaf0)
132
+ + xmkstemp(): avoid showing truncated template more carefully
133
+
134
+ After failing to create a temporary file using mkstemp(), failing
135
+ pathname was not reported correctly on some platforms.
136
+
137
+
138
+* jc/same-encoding (2012-12-10) 1 commit
139
+ (merged to 'next' on 2012-12-17 at 86b41c7)
140
+ + format_commit_message(): simplify calls to logmsg_reencode()
141
+
142
+ Finishing touches to the series to unify "Do we need to reencode
143
+ between these two encodings?" logic.
144
+
145
+
146
+* jc/test-cvs-no-init-in-existing-dir (2012-12-24) 1 commit
147
+ (merged to 'next' on 2012-12-26 at 3b93f37)
148
+ + t9200: let "cvs init" create the test repository
149
+
150
+ t9200 runs "cvs init" on a directory that already exists, but a
151
+ platform can configure this fail for the current user (e.g. you
152
+ need to be in the cvsadmin group on NetBSD 6.0).
153
+
154
+
155
+* jc/test-portability (2012-12-19) 3 commits
156
+ (merged to 'next' on 2012-12-22 at 123041b)
157
+ + t9020: use configured Python to run the test helper
158
+ + t3600: Avoid "cp -a", which is a GNUism
159
+ + Merge branch 'jc/maint-test-portability' into 'jc/test-portability'
160
+ (this branch uses jc/maint-test-portability.)
161
+
162
+ The remainder of jc/maint-test-portability, applicable to 'master'.
163
+
164
+
165
+* jk/repack-ref-racefix (2012-12-21) 1 commit
166
+ (merged to 'next' on 2012-12-22 at 03e1ca9)
167
+ + refs: do not use cached refs in repack_without_ref
168
+
169
+ "git pack-refs" that ran in parallel to another process that
170
+ created new refs had a nasty race.
171
+
172
+
173
+* md/gitweb-sort-by-age (2012-12-11) 1 commit
174
+ (merged to 'next' on 2012-12-13 at 9f39410)
175
+ + gitweb: Sort projects with undefined ages last
176
+
177
+ Gitweb showed repositories without any commit at the top in its
178
+ age-sorted view, in which the users are interested in looking at
179
+ active projects; sorting them at the bottom makes it more useful.
180
+
181
+
182
+* mh/ceiling (2012-10-29) 8 commits
183
+ (merged to 'next' on 2012-11-26 at d1ce76a)
184
+ + string_list_longest_prefix(): remove function
185
+ + setup_git_directory_gently_1(): resolve symlinks in ceiling paths
186
+ + longest_ancestor_length(): require prefix list entries to be normalized
187
+ + longest_ancestor_length(): take a string_list argument for prefixes
188
+ + longest_ancestor_length(): use string_list_split()
189
+ + Introduce new function real_path_if_valid()
190
+ + real_path_internal(): add comment explaining use of cwd
191
+ + Introduce new static function real_path_internal()
192
+
193
+ Elements of GIT_CEILING_DIRECTORIES list may not match the real
194
+ pathname we obtain from getcwd(), leading the GIT_DIR discovery
195
+ logic to escape the ceilings the user thought to have specified.
196
+
197
+
198
+* mh/pthreads-autoconf (2012-11-27) 1 commit
199
+ (merged to 'next' on 2012-11-28 at 780600e)
200
+ + configure.ac: fix pthreads detection on Mac OS X
201
+
202
+
203
+* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
204
+ (merged to 'next' on 2012-12-26 at 2ff59ab)
205
+ + graph.c: infinite loop in git whatchanged --graph -m
206
+
207
+ The --graph code fell into infinite loop when asked to do what the
208
+ code did not expect ;-)
209
+
210
+
211
+* mk/qnx (2012-12-19) 2 commits
212
+ (merged to 'next' on 2012-12-22 at 0473197)
213
+ + Port to QNX
214
+ + Make lock local to fetch_pack
215
+ (this branch uses dm/port.)
216
+
217
+ Port to QNX.
218
+
219
+
220
+* ms/subtree-fixlets (2012-12-22) 2 commits
221
+ (merged to 'next' on 2012-12-26 at 1cb26eb)
222
+ + git-subtree: fix typo in manpage
223
+ + git-subtree: ignore git-subtree executable
224
+
225
+
226
+* nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits
227
+ (merged to 'next' on 2012-12-18 at 33e4488)
228
+ + cache-tree: invalidate i-t-a paths after generating trees
229
+ + cache-tree: fix writing cache-tree when CE_REMOVE is present
230
+ + cache-tree: replace "for" loops in update_one with "while" loops
231
+ + cache-tree: remove dead i-t-a code in verify_cache()
232
+
233
+ Writing out a tree object when you still have intent-to-add entries
234
+ in the index left an incorrect cache-tree data there.
235
+
236
+
237
+* pf/editor-ignore-sigint (2012-12-02) 5 commits
238
+ (merged to 'next' on 2012-12-07 at 6b04419)
239
+ + launch_editor: propagate signals from editor to git
240
+ + run-command: do not warn about child death from terminal
241
+ + launch_editor: ignore terminal signals while editor has control
242
+ + launch_editor: refactor to use start/finish_command
243
+ + run-command: drop silent_exec_failure arg from wait_or_whine
244
+
245
+ The behaviour visible to the end users was confusing, when they
246
+ attempt to kill a process spawned in the editor that was in turn
247
+ launched by Git with SIGINT (or SIGQUIT), as Git would catch that
248
+ signal and die. We ignore these signals now.
249
+
250
+
251
+* rb/http-cert-cred-no-username-prompt (2012-12-21) 1 commit
252
+ (merged to 'next' on 2012-12-22 at 9fc28ed)
253
+ + http.c: Avoid username prompt for certifcate credentials
254
+
255
+ It is wrong to ask for username if the authentication is done by
256
+ certificate identity.
257
+
258
+
259
+* sp/shortlog-missing-lf (2012-12-11) 2 commits
260
+ (merged to 'next' on 2012-12-11 at 64b8429)
261
+ + strbuf_add_wrapped*(): Remove unused return value
262
+ + shortlog: fix wrapping lines of wraplen
263
+
264
+ When a line to be wrapped has a solid run of non space characters
265
+ whose length exactly is the wrap width, "git shortlog -w" failed to
266
+ add a newline after such a line.
267
+
268
+
269
+* ss/nedmalloc-compilation (2012-12-11) 1 commit
270
+ (merged to 'next' on 2012-12-13 at c1f0d7f)
271
+ + nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
272
+
273
+
274
+* ss/svn-prompt (2012-12-17) 3 commits
275
+ (merged to 'next' on 2012-12-26 at 1012ae2)
276
+ + git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
277
+ + perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
278
+ + git-svn, perl/Git.pm: add central method for prompting passwords
279
+
280
+ Tweak the way "git svn" asks for password to be in line with the
281
+ rest of the system, so that the same SSH/GIT_ASKPASS can be used.
282
283
--------------------------------------------------
284
[Stalled]
@@ -90,54 +305,6 @@ repositories listed at
305
An early draft that is still incomplete.
306
307
93
-* fc/remote-bzr (2012-12-13) 10 commits
94
- - (fixup) test-bzr.sh: fix multi-line string assignment
95
- - remote-bzr: detect local repositories
96
- - remote-bzr: add support for older versions of bzr
97
- - remote-bzr: add support to push special modes
98
- - remote-bzr: add support for fecthing special modes
99
- - remote-bzr: add simple tests
100
- - remote-bzr: update working tree upon pushing
101
- - remote-bzr: add support for remote repositories
102
- - remote-bzr: add support for pushing
103
- - Add new remote-bzr transport helper
104
-
105
- New remote helper for bzr (v3). With minor fixes, this may be ready
106
- for 'next'.
107
-
108
-
109
-* mo/cvs-server-updates (2012-12-09) 18 commits
110
- - t9402: Use TABs for indentation
111
- - t9402: Rename check.cvsCount and check.list
112
- - t9402: Simplify git ls-tree
113
- - t9402: Add missing &&; Code style
114
- - t9402: No space after IO-redirection
115
- - t9402: Dont use test_must_fail cvs
116
- - t9402: improve check_end_tree() and check_end_full_tree()
117
- - t9402: sed -i is not portable
118
- - cvsserver Documentation: new cvs ... -r support
119
- - cvsserver: add t9402 to test branch and tag refs
120
- - cvsserver: support -r and sticky tags for most operations
121
- - cvsserver: Add version awareness to argsfromdir
122
- - cvsserver: generalize getmeta() to recognize commit refs
123
- - cvsserver: implement req_Sticky and related utilities
124
- - cvsserver: add misc commit lookup, file meta data, and file listing functions
125
- - cvsserver: define a tag name character escape mechanism
126
- - cvsserver: cleanup extra slashes in filename arguments
127
- - cvsserver: factor out git-log parsing logic
128
-
129
- Needs review by folks interested in cvsserver.
130
-
131
-
132
-* aw/rebase-am-failure-detection (2012-10-11) 1 commit
133
- - rebase: Handle cases where format-patch fails
134
-
135
- Save output from format-patch command in a temporary file, just in
136
- case it aborts, to give a better failure-case behaviour.
137
-
138
- Will merge to 'next'.
139
-
140
-
308
* jk/lua-hackery (2012-10-07) 6 commits
309
- pretty: fix up one-off format_commit_message calls
310
- Minimum compilation fixup
@@ -151,18 +318,11 @@ repositories listed at
318
"parents", etc.
319
320
154
-* fc/remote-testgit-feature-done (2012-10-29) 1 commit
155
- - remote-testgit: properly check for errors
156
-
157
- Needs review and Ack (or Nack) from people involved in the remote
158
- helper interface for this to move forward.
159
-
160
-
321
* rc/maint-complete-git-p4 (2012-09-24) 1 commit
322
(merged to 'next' on 2012-10-29 at af52cef)
323
+ Teach git-completion about git p4
324
165
- Comment from Pete will need to be addressed in a follow-up patch.
325
+ Comment from Pete will need to be addressed ($gmane/206172).
326
327
Will kick back to 'pu'.
328
@@ -210,13 +370,6 @@ repositories listed at
370
Stalled mostly due to lack of responses.
371
372
213
-* jc/doc-default-format (2012-11-26) 2 commits
214
- - [SQAUSH] allow "cd Doc* && make DEFAULT_DOC_TARGET=..."
215
- - Allow generating a non-default set of documentation
216
-
217
- Need to address the installation half if this is to be any useful.
218
-
219
-
373
* jc/add-delete-default (2012-08-13) 1 commit
374
- git add: notice removal of tracked paths by default
375
@@ -238,17 +391,125 @@ repositories listed at
391
- Teach remote.c about the remote.default configuration setting.
392
- Rename remote.c's default_remote_name static variables.
393
241
- When the user does not specify what remote to interact with, we
242
- often attempt to use 'origin'. This can now be customized via a
243
- configuration variable.
394
+ When the user does not specify what remote to interact with, we
395
+ often attempt to use 'origin'. This can now be customized via a
396
+ configuration variable.
397
+
398
+ Expecting a reroll.
399
+ $gmane/210151
400
+
401
+ "The first remote becomes the default" bit is better done as a
402
+ separate step.
403
+
404
+--------------------------------------------------
405
+[Cooking]
406
+
407
+* jc/doc-default-format (2013-01-03) 2 commits
408
+ - Allow installing a non-default set of documentation
409
+ - Allow generating a non-default set of documentation
410
+
411
+ Instead of the default of generating html/man and installing man,
412
+ you can control what "make doc" and "make install-doc" do via two
413
+ make variables.
414
+
415
+ Will merge to 'next'.
416
+
417
+
418
+* fc/remote-testgit-feature-done (2012-10-29) 1 commit
419
+ - remote-testgit: properly check for errors
420
+
421
+ In the longer term, tightening rules is a good thing to do, and
422
+ because nobody who has worked in the remote helper area seems to be
423
+ interested in reviewing this, I would assume they do not think
424
+ such a retroactive tightening will affect their remote helpers. So
425
+ let's advance this topic to see what happens.
426
+
427
+
428
+* fc/remote-bzr (2013-01-02) 9 commits
429
+ - remote-bzr: detect local repositories
430
+ - remote-bzr: add support for older versions of bzr
431
+ - remote-bzr: add support to push special modes
432
+ - remote-bzr: add support for fecthing special modes
433
+ - remote-bzr: add simple tests
434
+ - remote-bzr: update working tree upon pushing
435
+ - remote-bzr: add support for remote repositories
436
+ - remote-bzr: add support for pushing
437
+ - Add new remote-bzr transport helper
438
+
439
+ New remote helper for bzr, with minimum fix squashed in.
440
+
441
+ Will merge to 'next'.
442
+
443
+
444
+* mo/cvs-server-updates (2012-12-09) 18 commits
445
+ - t9402: Use TABs for indentation
446
+ - t9402: Rename check.cvsCount and check.list
447
+ - t9402: Simplify git ls-tree
448
+ - t9402: Add missing &&; Code style
449
+ - t9402: No space after IO-redirection
450
+ - t9402: Dont use test_must_fail cvs
451
+ - t9402: improve check_end_tree() and check_end_full_tree()
452
+ - t9402: sed -i is not portable
453
+ - cvsserver Documentation: new cvs ... -r support
454
+ - cvsserver: add t9402 to test branch and tag refs
455
+ - cvsserver: support -r and sticky tags for most operations
456
+ - cvsserver: Add version awareness to argsfromdir
457
+ - cvsserver: generalize getmeta() to recognize commit refs
458
+ - cvsserver: implement req_Sticky and related utilities
459
+ - cvsserver: add misc commit lookup, file meta data, and file listing functions
460
+ - cvsserver: define a tag name character escape mechanism
461
+ - cvsserver: cleanup extra slashes in filename arguments
462
+ - cvsserver: factor out git-log parsing logic
463
+
464
+ As nobody seems to be stepping up to review this, I am tempted to
465
+ merge this to 'next and see who screams.
466
+
467
+
468
+* jc/submittingpatches (2013-01-02) 4 commits
469
+ - SubmittingPatches: give list and maintainer addresses
470
+ - SubmittingPatches: remove overlong checklist
471
+ - SubmittingPatches: mention subsystems with dedicated repositories
472
+ - SubmittingPatches: who am I and who cares?
473
+
474
+ Will merge to 'next'.
475
+
476
+
477
+* kb/maint-bundle-doc (2013-01-01) 2 commits
478
+ - Documentation: full-ness of a bundle is significant for cloning
479
+ - Documentation: correct example restore from bundle
480
+
481
+ Will merge to 'next'.
482
+
483
+
484
+* nd/maint-branch-desc-doc (2013-01-03) 5 commits
485
+ - format-patch: pick up branch description when no ref is specified
486
+ - format-patch: pick up correct branch name from symbolic ref
487
+ - t4014: a few more tests on cover letter using branch description
488
+ - branch: delete branch description if it's empty
489
+ - config.txt: a few lines about branch.<name>.description
490
+
491
+ Will merge to 'next'.
492
+
493
+
494
+* tb/test-t9020-no-which (2013-01-01) 1 commit
495
+ - t9020: which is not portable
496
+
497
+ Will merge to 'next'.
498
+
499
245
- Expecting a reroll.
500
+* tb/test-t9810-no-sed-i (2013-01-01) 1 commit
501
+ - t9810: Do not use sed -i
502
247
- "The first remote becomes the default" bit is better done as a
248
- separate step.
503
+ Will merge to 'next'.
504
+
505
+
506
+* aw/rebase-am-failure-detection (2012-10-11) 1 commit
507
+ (merged to 'next' on 2013-01-02 at b9db3a2)
508
+ + rebase: Handle cases where format-patch fails
509
+
510
+ Save output from format-patch command in a temporary file, just in
511
+ case it aborts, to give a better failure-case behaviour.
512
250
---------------------------------------------------
251
-[Cooking]
513
514
* ap/status-ignored-in-ignored-directory (2013-01-01) 2 commits
515
- git-status: Test --ignored behavior
@@ -258,38 +519,34 @@ repositories listed at
519
520
521
* ta/remove-stale-translated-tut (2012-12-27) 1 commit
261
- - Remove Documentation/pt_BR/gittutorial.txt
522
+ (merged to 'next' on 2013-01-02 at e70df8e)
523
+ + Remove Documentation/pt_BR/gittutorial.txt
524
525
Remove a translation of a document that was left stale.
526
265
- Will merge to 'next'.
266
-
527
528
* er/stop-recommending-parsecvs (2012-12-28) 1 commit
269
- - Remove the suggestion to use parsecvs, which is currently broken.
529
+ (merged to 'next' on 2013-01-02 at fd816dd)
530
+ + Remove the suggestion to use parsecvs, which is currently broken.
531
532
Stop recommending a defunct third-party software.
533
273
- Will merge to 'next'.
274
-
534
535
* as/test-name-alias-uniquely (2012-12-28) 1 commit
277
- - Use longer alias names in subdirectory tests
536
+ (merged to 'next' on 2013-01-02 at e297810)
537
+ + Use longer alias names in subdirectory tests
538
539
A few short-and-bland aliases used in the tests were interfering
540
with git-custom command in user's $PATH.
541
282
- Will merge to 'next'.
283
-
542
543
* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
286
- - merge --no-edit: do not credit people involved in the side branch
544
+ (merged to 'next' on 2013-01-02 at 8795e87)
545
+ + merge --no-edit: do not credit people involved in the side branch
546
547
Stop spending cycles to compute information to be placed on
548
commented lines in "merge --no-edit".
549
291
- Will merge to 'next'.
292
-
550
551
* as/check-ignore (2012-12-28) 19 commits
552
- Add git-check-ignore sub-command
@@ -313,10 +570,12 @@ repositories listed at
570
- api-directory-listing.txt: update to match code
571
572
Rerolled. The early parts looked mostly fine; we may want to split
316
- this into two topics and have the early half progress earlier.
573
+ this into two topics and have the early half graduate sooner.
574
575
319
-* jc/format-patch-reroll (2012-12-22) 7 commits
576
+* jc/format-patch-reroll (2013-01-02) 9 commits
577
+ - format-patch: give --reroll-count a short synonym -v
578
+ - format-patch: document and test --reroll-count
579
- format-patch: add --reroll-count=$N option
580
- get_patch_filename(): split into two functions
581
- get_patch_filename(): drop "just-numbers" hack
@@ -329,22 +588,16 @@ repositories listed at
588
fourth iteration of a patch series, to make it easier for the
589
submitter to keep separate copies for iterations.
590
332
- Needs tests and documentation updates.
333
-
334
-
335
-* ms/subtree-fixlets (2012-12-22) 2 commits
336
- (merged to 'next' on 2012-12-26 at 1cb26eb)
337
- + git-subtree: fix typo in manpage
338
- + git-subtree: ignore git-subtree executable
339
-
340
- Will merge to 'master' in the first batch.
591
+ Will merge to 'next'.
592
593
594
* mz/pick-unborn (2012-12-23) 2 commits
344
- - learn to pick/revert into unborn branch
345
- - tests: move test_cmp_rev to test-lib-functions
595
+ (merged to 'next' on 2013-01-02 at 22b9951)
596
+ + learn to pick/revert into unborn branch
597
+ + tests: move test_cmp_rev to test-lib-functions
598
347
- Will merge to 'next'.
599
+ Allows "git cherry-pick $commit" when you do not have any history
600
+ behind HEAD yet.
601
602
603
* nd/retire-fnmatch (2013-01-01) 7 commits
@@ -364,13 +617,6 @@ repositories listed at
617
Will merge to 'next'.
618
619
367
-* jc/test-cvs-no-init-in-existing-dir (2012-12-24) 1 commit
368
- (merged to 'next' on 2012-12-26 at 3b93f37)
369
- + t9200: let "cvs init" create the test repository
370
-
371
- Will merge to 'master' in the first batch.
372
-
373
-
620
* os/gitweb-highlight-uncaptured (2013-01-01) 1 commit
621
- gitweb: fix error in sanitize when highlight is enabled
622
@@ -388,62 +634,6 @@ repositories listed at
634
proof-of-concept code.
635
636
391
-* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
392
- (merged to 'next' on 2012-12-26 at 2ff59ab)
393
- + graph.c: infinite loop in git whatchanged --graph -m
394
-
395
- The --graph code fell into infinite loop when asked to do what the
396
- code did not expect ;-)
397
-
398
- Will merge to 'master' in the first batch.
399
-
400
-
401
-* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit
402
- (merged to 'next' on 2012-12-22 at 18cdaf0)
403
- + xmkstemp(): avoid showing truncated template more carefully
404
-
405
- An earlier patch to save original arguments to mkstemp() away and
406
- use it to report what filename we failed to create incorrectly used
407
- the buffer munged by failing mkstemp().
408
-
409
- Will merge to 'master' in the first batch.
410
-
411
-
412
-* jc/maint-test-portability (2012-12-19) 3 commits
413
- (merged to 'next' on 2012-12-22 at daeed53)
414
- + t4014: fix arguments to grep
415
- + t9502: do not assume GNU tar
416
- + t0200: "locale" may not exist
417
- (this branch is used by jc/test-portability.)
418
-
419
- Minor test fixes noticed while running our tests on OpenBSD 5.2,
420
- applicable to 'maint'.
421
-
422
- Will merge to 'master' in the first batch.
423
-
424
-
425
-* jc/test-portability (2012-12-19) 3 commits
426
- (merged to 'next' on 2012-12-22 at 123041b)
427
- + t9020: use configured Python to run the test helper
428
- + t3600: Avoid "cp -a", which is a GNUism
429
- + Merge branch 'jc/maint-test-portability' into 'jc/test-portability'
430
- (this branch uses jc/maint-test-portability.)
431
-
432
- The remainder of jc/maint-test-portability, applicable to 'master'.
433
-
434
- Will merge to 'master' in the first batch.
435
-
436
-
437
-* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit
438
- (merged to 'next' on 2012-12-22 at 540df2c)
439
- + compat/fnmatch: update old-style definition to ANSI
440
-
441
- Update old-style function definition "int foo(bar) int bar; {}"
442
- to "int foo(int bar) {}".
443
-
444
- Will merge to 'master' in the first batch.
445
-
446
-
637
* jk/pathspec-literal (2012-12-19) 1 commit
638
(merged to 'next' on 2012-12-22 at c794bd6)
639
+ add global --literal-pathspecs option
@@ -451,29 +641,22 @@ repositories listed at
641
Allow scripts to feed literal paths to commands that take
642
pathspecs, by disabling wildcard globbing.
643
454
- Will merge to 'master' in the first batch.
455
-
456
-
457
-* da/p4merge-mktemp (2012-12-26) 1 commit
458
- (merged to 'next' on 2012-12-26 at 036938a)
459
- + mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
460
-
461
- Create an empty file in $TMPDIR instead of using an empty file in
462
- the local directory.
463
-
464
- Will merge to 'master' in the first batch.
644
+ Will merge to 'master'.
645
646
647
* er/python-version-requirements (2012-12-28) 1 commit
468
- - Add checks to Python scripts for version dependencies.
648
+ (merged to 'next' on 2013-01-02 at 1023a3f)
649
+ + Add checks to Python scripts for version dependencies.
650
470
- Will merge to 'next'.
651
+ Some python scripts we ship cannot be run with old versions of the
652
+ interpreter.
653
654
655
* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
656
- Highlight the link target line in Gitweb using CSS
657
658
Expecting a reroll.
659
+ $gmane/211935
660
661
662
* mz/oneway-merge-wo-u-no-lstat (2012-12-20) 1 commit
@@ -482,27 +665,6 @@ repositories listed at
665
666
Optimize "read-tree -m <tree-ish>" without "-u".
667
485
- Will cook in 'next'.
486
-
487
-
488
-* jk/repack-ref-racefix (2012-12-21) 1 commit
489
- (merged to 'next' on 2012-12-22 at 03e1ca9)
490
- + refs: do not use cached refs in repack_without_ref
491
-
492
- Race-fix for pack-refs running in parallel to ref creation.
493
-
494
- Will merge to 'master' in the first batch.
495
-
496
-
497
-* rb/http-cert-cred-no-username-prompt (2012-12-21) 1 commit
498
- (merged to 'next' on 2012-12-22 at 9fc28ed)
499
- + http.c: Avoid username prompt for certifcate credentials
500
-
501
- It is wrong to ask for username if the authentication is done by
502
- certificate identity.
503
-
504
- Will merge to 'master' in the first batch.
505
-
668
669
* wk/submodule-update-remote (2012-12-19) 3 commits
670
(merged to 'next' on 2012-12-22 at 7ddf897)
@@ -513,7 +675,7 @@ repositories listed at
675
The beginning of 'integrate with the tip of the remote branch, not
676
the commit recorded in the superproject gitlink' support.
677
516
- Will merge to 'master' in the first batch.
678
+ Will merge to 'master'.
679
680
681
* cc/no-gitk-build-dependency (2012-12-18) 3 commits
@@ -526,7 +688,7 @@ repositories listed at
688
subdirectory. Reimplementing the dependency tracking rules needs
689
to be done in gitk history separately.
690
529
- Will merge to 'master' in the first batch.
691
+ Will merge to 'master'.
692
693
694
* jc/format-color-auto (2012-12-17) 2 commits
@@ -537,22 +699,11 @@ repositories listed at
699
Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
700
not color its output when writing to a non-terminal.
701
540
- Will merge to 'master' in the first batch.
541
-
542
-
543
-* ss/svn-prompt (2012-12-17) 3 commits
544
- (merged to 'next' on 2012-12-26 at 1012ae2)
545
- + git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
546
- + perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
547
- + git-svn, perl/Git.pm: add central method for prompting passwords
548
-
549
- Tweak the way "git svn" asks for password to be in line with the
550
- rest of the system, so that the same SSH/GIT_ASKPASS can be used.
702
+ Will merge to 'master'.
703
552
- Will merge to 'master' in the first batch.
704
554
-
555
-* zk/clean-report-failure (2012-12-17) 1 commit
705
+* zk/clean-report-failure (2013-01-02) 2 commits
706
+ - (SQUASH???) fix-up only the trivial bits
707
- git-clean: Display more accurate delete messages
708
709
"git clean" states what it is going to remove and then goes on to
@@ -560,7 +711,7 @@ repositories listed at
711
removed after recursing into a directory, which makes the output
712
confusing and even wrong.
713
563
- Expecting a reroll.
714
+ Rerolled, and comments sent.
715
716
717
* mp/complete-paths (2012-12-21) 1 commit
@@ -582,7 +733,7 @@ repositories listed at
733
applied to only a single directory itself with "path/" like the
734
exclude mechanism does.
735
585
- Will merge to 'master' in the first batch.
736
+ Will merge to 'master'.
737
738
739
* jk/mailmap-from-blob (2012-12-13) 5 commits
@@ -597,20 +748,7 @@ repositories listed at
748
of the history in bare repositories. This will help running tools
749
like shortlog in server settings.
750
600
- Will merge to 'master' in the first batch.
601
-
602
-
603
-* dm/port (2012-12-19) 4 commits
604
- (merged to 'next' on 2012-12-22 at 8adc198)
605
- + git-compat-util.h: do not #include <sys/param.h> by default
606
- + Generalize the inclusion of strings.h
607
- + Detect when the passwd struct is missing pw_gecos
608
- + Support builds when sys/param.h is missing
609
- (this branch is used by mk/qnx.)
610
-
611
- Add a few more knobs for new platform ports can tweak.
612
-
613
- Will merge to 'master' in the first batch.
751
+ Will merge to 'master'.
752
753
754
* jk/complete-commit-c (2012-12-15) 1 commit
@@ -620,7 +758,7 @@ repositories listed at
758
Complete "git commmit -c foo<TAB>" into a refname that begins with
759
"foo".
760
623
- Will merge to 'master' in the first batch.
761
+ Will merge to 'master'.
762
763
764
* jk/error-const-return (2012-12-15) 2 commits
@@ -632,46 +770,7 @@ repositories listed at
770
error() always returns -1, to reduce false "variable used
771
uninitialized" warnings. Looks somewhat ugly but not too much.
772
635
- Will merge to 'master' in the first batch.
636
-
637
-
638
-* mk/qnx (2012-12-19) 2 commits
639
- (merged to 'next' on 2012-12-22 at 0473197)
640
- + Port to QNX
641
- + Make lock local to fetch_pack
642
- (this branch uses dm/port.)
643
-
644
- Port to QNX.
645
-
646
- Will merge to 'master' in the first batch.
647
-
648
-
649
-* as/test-tweaks (2012-12-20) 7 commits
650
- (merged to 'next' on 2012-12-22 at 7312c6c)
651
- + tests: paint unexpectedly fixed known breakages in bold red
652
- + tests: test the test framework more thoroughly
653
- + tests: refactor mechanics of testing in a sub test-lib
654
- + tests: change info messages from yellow/brown to cyan
655
- + tests: paint skipped tests in blue
656
- + tests: paint known breakages in yellow
657
- + tests: test number comes first in 'not ok $count - $message'
658
-
659
- Various minor tweaks to the test framework to paint its output
660
- lines in colors that match what they mean better.
661
-
662
- Will merge to 'master' in the first batch.
663
-
664
-
665
-* sp/shortlog-missing-lf (2012-12-11) 2 commits
666
- (merged to 'next' on 2012-12-11 at 64b8429)
667
- + strbuf_add_wrapped*(): Remove unused return value
668
- + shortlog: fix wrapping lines of wraplen
669
-
670
- When a line to be wrapped has a solid run of non space characters
671
- whose length exactly is the wrap width, "git shortlog -w" failed to
672
- add a newline after such a line.
673
-
674
- Will merge to 'master' in the first batch.
773
+ Will merge to 'master'.
774
775
776
* ap/log-mailmap (2012-12-27) 10 commits
@@ -690,7 +789,8 @@ repositories listed at
789
Clean up various codepaths around mailmap and teach the "log"
790
machinery to use it.
791
693
- Waiting for further tweaks.
792
+ Expecting a reroll.
793
+ $gmane/212426
794
795
796
* jc/fetch-ignore-symref (2012-12-11) 1 commit
@@ -700,71 +800,7 @@ repositories listed at
800
Avoid false error from an attempt to update local symbolic ref via
801
fetch.
802
703
- Will merge to 'master' in the first batch.
704
-
705
-
706
-* md/gitweb-sort-by-age (2012-12-11) 1 commit
707
- (merged to 'next' on 2012-12-13 at 9f39410)
708
- + gitweb: Sort projects with undefined ages last
709
-
710
- Gitweb showed repositories without any commit at the top in its
711
- age-sorted view, in which the users are interested in looking at
712
- active projects; sorting them at the bottom makes it more useful.
713
-
714
- Will merge to 'master' in the first batch.
715
-
716
-
717
-* ss/nedmalloc-compilation (2012-12-11) 1 commit
718
- (merged to 'next' on 2012-12-13 at c1f0d7f)
719
- + nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
720
-
721
- Will merge to 'master' in the first batch.
722
-
723
-
724
-* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
725
- (merged to 'next' on 2012-12-11 at 6659fdc)
726
- + sh-setup: work around "unset IFS" bug in some shells
727
-
728
- Will merge to 'master' in the first batch.
729
-
730
-
731
-* jc/same-encoding (2012-12-10) 1 commit
732
- (merged to 'next' on 2012-12-17 at 86b41c7)
733
- + format_commit_message(): simplify calls to logmsg_reencode()
734
-
735
- Finishing touches to the series to unify "Do we need to reencode
736
- between these two encodings?" logic.
737
-
738
- Will merge to 'master' in the first batch.
739
-
740
-
741
-* nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits
742
- (merged to 'next' on 2012-12-18 at 33e4488)
743
- + cache-tree: invalidate i-t-a paths after generating trees
744
- + cache-tree: fix writing cache-tree when CE_REMOVE is present
745
- + cache-tree: replace "for" loops in update_one with "while" loops
746
- + cache-tree: remove dead i-t-a code in verify_cache()
747
-
748
- Writing out a tree object when you still have intent-to-add entries
749
- in the index left an incorrect cache-tree data there.
750
-
751
- Will merge to 'master' in the first batch.
752
-
753
-
754
-* pf/editor-ignore-sigint (2012-12-02) 5 commits
755
- (merged to 'next' on 2012-12-07 at 6b04419)
756
- + launch_editor: propagate signals from editor to git
757
- + run-command: do not warn about child death from terminal
758
- + launch_editor: ignore terminal signals while editor has control
759
- + launch_editor: refactor to use start/finish_command
760
- + run-command: drop silent_exec_failure arg from wait_or_whine
761
-
762
- Avoid confusing cases where the user hits Ctrl-C while in the editor
763
- session, not realizing git will receive the signal. Since most editors
764
- will take over the terminal and will block SIGINT, this is not likely
765
- to confuse anyone.
766
-
767
- Will merge to 'master' in the first batch.
803
+ Will merge to 'master'.
804
805
806
* bc/append-signed-off-by (2013-01-01) 12 commits
@@ -782,6 +818,7 @@ repositories listed at
818
- sequencer.c: remove broken support for rfc2822 continuation in footer
819
820
Expecting a reroll.
821
+ $gmane/212507
822
823
824
* mh/unify-xml-in-imap-send-and-http-push (2012-12-02) 8 commits
@@ -798,7 +835,7 @@ repositories listed at
835
Update imap-send to reuse xml quoting code from http-push codepath,
836
clean up some code, and fix a small bug.
837
801
- Will merge to 'master' in the first batch.
838
+ Will merge to 'master'.
839
840
841
* jk/fsck-dot-in-trees (2012-11-28) 2 commits
@@ -806,14 +843,7 @@ repositories listed at
843
+ fsck: warn about ".git" in trees
844
+ fsck: warn about '.' and '..' in trees
845
809
- Will merge to 'master' in the first batch.
810
-
811
-
812
-* mh/pthreads-autoconf (2012-11-27) 1 commit
813
- (merged to 'next' on 2012-11-28 at 780600e)
814
- + configure.ac: fix pthreads detection on Mac OS X
815
-
816
- Will merge to 'master' in the first batch.
846
+ Will merge to 'master'.
847
848
849
* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
@@ -826,29 +856,6 @@ repositories listed at
856
Deal with a situation where .config/git is a file and we notice
857
.config/git/config is not readable due to ENOTDIR, not ENOENT.
858
829
- Will cook in 'next'.
830
-
831
-
832
-* mh/ceiling (2012-10-29) 8 commits
833
- (merged to 'next' on 2012-11-26 at d1ce76a)
834
- + string_list_longest_prefix(): remove function
835
- + setup_git_directory_gently_1(): resolve symlinks in ceiling paths
836
- + longest_ancestor_length(): require prefix list entries to be normalized
837
- + longest_ancestor_length(): take a string_list argument for prefixes
838
- + longest_ancestor_length(): use string_list_split()
839
- + Introduce new function real_path_if_valid()
840
- + real_path_internal(): add comment explaining use of cwd
841
- + Introduce new static function real_path_internal()
842
-
843
- Elements of GIT_CEILING_DIRECTORIES list may not match the real
844
- pathname we obtain from getcwd(), leading the GIT_DIR discovery
845
- logic to escape the ceilings the user thought to have specified.
846
-
847
- Resurrected from Stalled; the earlier performance fear was
848
- unwarranted.
849
-
850
- Will merge to 'master' in the first batch.
851
-
859
860
* fc/fast-export-fixes (2012-12-03) 15 commits
861
(merged to 'next' on 2012-12-03 at f9df523)
@@ -868,7 +875,7 @@ repositories listed at
875
+ remote-testgit: fix direction of marks
876
+ fast-export: avoid importing blob marks
877
871
- Will merge to 'master' in the first batch.
878
+ Will merge to 'master'.
879
880
881
* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
@@ -879,8 +886,6 @@ repositories listed at
886
possibility that whitespace fix could shrink the preimage and
887
change the number of lines in it.
888
882
- Will cook in 'next'.
883
-
889
890
* nd/pathspec-wildcard (2012-11-26) 4 commits
891
(merged to 'next' on 2012-12-03 at eca0fcb)
@@ -889,7 +894,7 @@ repositories listed at
894
+ pathspec: do exact comparison on the leading non-wildcard part
895
+ pathspec: save the non-wildcard length part
896
892
- Will merge to 'master' in the first batch.
897
+ Will merge to 'master'.
898
899
900
* nd/wildmatch (2013-01-01) 18 commits
@@ -921,8 +926,6 @@ repositories listed at
926
with double-asterisks "foo/**/bar" to match any number of directory
927
hierarchies.
928
924
- Will cook in 'next'.
925
-
929
930
* cr/push-force-tag-update (2012-12-03) 10 commits
931
(merged to 'next' on 2012-12-04 at af2e3a9)
@@ -939,4 +942,4 @@ repositories listed at
942
943
Require "-f" for push to update a tag, even if it is a fast-forward.
944
942
- Will merge to 'master' in the first batch.
945
+ Will merge to 'master'.