What's cooking (2013/01 #11)
Junio C Hamano committed
Jan 30, 2013 at 10:32 UTC
69f640afba8f4f3f49da9b9be6fd6f50b4027b1e
1 file changed
+290
-244
whats-cooking.txt
+290
-244
@@ -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, #10; Sun, 27)
4
-X-master-at: 50a6b54c03219ad74b9f3f839e0321be18daeaf6
5
-X-next-at: acf9419c4c1775dd98c80ac4ecc3b5dd89df9fb4
3
+Subject: What's cooking in git.git (Jan 2013, #11; Wed, 30)
4
+X-master-at: 070c57df42ea4eadcc43d0456d114560124326c3
5
+X-next-at: 7d3a2ef96c8474fb18c8a5ca045cdbeb6180ac4f
6
7
-What's cooking in git.git (Jan 2013, #10; Sun, 27)
7
+What's cooking in git.git (Jan 2013, #11; Wed, 30)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -22,127 +22,138 @@ repositories listed at
22
--------------------------------------------------
23
[New Topics]
24
25
-* bc/git-p4-for-python-2.4 (2013-01-26) 2 commits
26
- - git-p4.py: support Python 2.4
27
- - git-p4.py: support Python 2.5
25
+* ab/gitweb-use-same-scheme (2013-01-28) 1 commit
26
+ - gitweb: refer to picon/gravatar images over the same scheme
27
29
- With small updates to remove dependency on newer features of
30
- Python, keep git-p4 usable with older Python.
28
+ Avoid mixed contents on a page coming via http and https when
29
+ gitweb is hosted on a https server.
30
31
Will merge to 'next'.
32
33
35
-* jk/gc-auto-after-fetch (2013-01-26) 1 commit
36
- - Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch
37
- (this branch uses jk/maint-gc-auto-after-fetch.)
34
+* jk/python-styles (2013-01-29) 1 commit
35
+ - CodingGuidelines: add Python coding guidelines
36
39
- This is to resolve merge conflicts early for the same topic to
40
- recent codebase.
37
+ Expecting a reroll.
38
+ $gmane/215007.
39
42
- Will merge to 'next'.
40
41
+* mn/send-email-authinfo (2013-01-29) 1 commit
42
+ - git-send-email: add ~/.authinfo parsing
43
45
-* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits
46
- - fetch-pack: avoid repeatedly re-scanning pack directory
47
- - fetch: run gc --auto after fetching
48
- (this branch is used by jk/gc-auto-after-fetch.)
44
+ Expecting a reroll.
45
+ $gmane/215004, $gmane/215024.
46
50
- Help "fetch only" repositories that does not trigger "gc --auto"
51
- often enough.
47
53
- Will merge to 'next' via jk/gc-auto-after-fetch.
48
+* nd/edit-branch-desc-while-detached (2013-01-30) 1 commit
49
+ (merged to 'next' on 2013-01-30 at 69307d6)
50
+ + branch: no detached HEAD check when editing another branch's description
51
+ (this branch is used by nd/branch-error-cases.)
52
53
+ Attempt to "branch --edit-description" an existing branch, while
54
+ being on a detached HEAD, errored out.
55
56
-* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits
57
- - logmsg_reencode: lazily load missing commit buffers
58
- - logmsg_reencode: never return NULL
59
- - commit: drop useless xstrdup of commit message
56
+ Will merge to 'master'.
57
61
- Clarify the ownership rule for commit->buffer field, which some
62
- callers incorrectly accessed without making sure the data is
63
- available there.
58
+--------------------------------------------------
59
+[Graduated to "master"]
60
65
- Will merge to 'next'.
61
+* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit
62
+ (merged to 'next' on 2013-01-25 at d113c1a)
63
+ + git-completion.bash: replace zsh notation that breaks bash 3.X
64
65
+ Fix use of an array notation that older versions of bash do not
66
+ understand.
67
68
-* pw/git-p4-on-cygwin (2013-01-26) 21 commits
69
- - git p4: introduce gitConfigBool
70
- - git p4: avoid shell when calling git config
71
- - git p4: avoid shell when invoking git config --get-all
72
- - git p4: avoid shell when invoking git rev-list
73
- - git p4: avoid shell when mapping users
74
- - git p4: disable read-only attribute before deleting
75
- - git p4 test: use test_chmod for cygwin
76
- - git p4: cygwin p4 client does not mark read-only
77
- - git p4 test: avoid wildcard * in windows
78
- - git p4 test: use LineEnd unix in windows tests too
79
- - git p4 test: newline handling
80
- - git p4: scrub crlf for utf16 files on windows
81
- - git p4: remove unreachable windows \r\n conversion code
82
- - git p4 test: translate windows paths for cygwin
83
- - git p4 test: start p4d inside its db dir
84
- - git p4 test: use client_view in t9806
85
- - git p4 test: avoid loop in client_view
86
- - git p4 test: use client_view to build the initial client
87
- - git p4: generate better error message for bad depot path
88
- - git p4: remove unused imports
89
- - git p4: temp branch name should use / even on windows
90
-
91
- Improve "git p4" on Cygwin. The cover letter said it is not yet
92
- ready for full Windows support so I won't move this to 'next' until
93
- told by the author (the area maintainer) otherwise.
68
69
+* dl/am-hg-locale (2013-01-18) 1 commit
70
+ (merged to 'next' on 2013-01-25 at 3419019)
71
+ + am: invoke perl's strftime in C locale
72
96
-* ss/mergetools-tortoise (2013-01-26) 2 commits
97
- - mergetools: allow passing pathnames with SP in them to TortoiseGitMerge
98
- - mergetools: support TortoiseGitMerge
73
+ Datestamp recorded in "Hg" format patch was reformatted incorrectly
74
+ to an e-mail looking date using locale dependant strftime, causing
75
+ patch application to fail.
76
100
- Update mergetools to work better with newer merge helper tortoise ships.
77
102
- Will merge to 'next'.
78
+* jc/help (2013-01-18) 1 commit
79
+ (merged to 'next' on 2013-01-25 at b2b087e)
80
+ + help: include <common-cmds.h> only in one file
81
82
+ A header file that has the definition of a static array was
83
+ included in two places, wasting the space.
84
105
-* da/mergetool-docs (2013-01-27) 4 commits
106
- - doc: generate a list of valid merge tools
107
- - mergetool--lib: add functions for finding available tools
108
- - mergetool--lib: improve the help text in guess_merge_tool()
109
- - mergetool--lib: simplify command expressions
110
- (this branch uses jk/mergetool.)
85
112
- Build on top of the clean-up done by jk/mergetool and automatically
113
- generate the list of mergetool and difftool backends the build
114
- supports to be included in the documentation.
86
+* nd/magic-pathspec-from-root (2013-01-21) 2 commits
87
+ (merged to 'next' on 2013-01-25 at b056b57)
88
+ + grep: avoid accepting ambiguous revision
89
+ + Update :/abc ambiguity check
90
116
- This may still need to be fixed up at minor details; I'd like to
117
- see a review from John Keeping on these.
91
+ When giving arguments without "--" disambiguation, object names
92
+ that come earlier on the command line must not be interpretable as
93
+ pathspecs and pathspecs that come later on the command line must
94
+ not be interpretable as object names. Tweak the disambiguation
95
+ rule so that ":/" (no other string before or after) is always
96
+ interpreted as a pathspec, to avoid having to say "git cmd -- :/".
97
98
120
-* nd/branch-error-cases (2013-01-27) 4 commits
121
- - branch: mark more strings for translation
122
- - branch: give a more helpful message on redundant arguments
123
- - branch: reject -D/-d without branch name
124
- - branch: no detached HEAD check when editing another branch's description
99
+* rr/minimal-stat (2013-01-22) 1 commit
100
+ (merged to 'next' on 2013-01-25 at 11c4453)
101
+ + Enable minimal stat checking
102
126
- Fix various error messages and conditions in "git branch", e.g. we
127
- advertised "branch -d/-D" to remove one or more branches but actually
128
- implemented removal of zero or more branches---request to remove no
129
- branches was not rejected.
103
+ Some reimplementations of Git does not write all the stat info back
104
+ to the index due to their implementation limitations (e.g. jgit
105
+ running on Java). A configuration option can tell Git to ignore
106
+ changes to most of the stat fields and only pay attention to mtime
107
+ and size, which these implementations can reliably update. This
108
+ avoids excessive revalidation of contents.
109
+
110
+
111
+* tb/t0050-maint (2013-01-21) 3 commits
112
+ (merged to 'next' on 2013-01-25 at 682b1e2)
113
+ + t0050: Use TAB for indentation
114
+ + t0050: honor CASE_INSENSITIVE_FS in add (with different case)
115
+ + t0050: known breakage vanished in merge (case change)
116
131
- Will merge to 'next', perhaps after rebasing on an older base
132
- so that this can later be merged to the maintenance track.
117
+ Update tests that were expecting to fail due to a bug that was
118
+ fixed earlier.
119
120
--------------------------------------------------
121
[Stalled]
122
137
-* mp/complete-paths (2013-01-11) 1 commit
138
- - git-completion.bash: add support for path completion
123
+* dg/subtree-fixes (2013-01-08) 7 commits
124
+ - contrib/subtree: mkdir the manual directory if needed
125
+ - contrib/subtree: honor $(DESTDIR)
126
+ - contrib/subtree: fix synopsis and command help
127
+ - contrib/subtree: better error handling for "add"
128
+ - contrib/subtree: add --unannotate option
129
+ - contrib/subtree: use %B for split Subject/Body
130
+ - t7900: remove test number comments
131
140
- The completion script used to let the default completer to suggest
141
- pathnames, which gave too many irrelevant choices (e.g. "git add"
142
- would not want to add an unmodified path). Teach it to use a more
143
- git-aware logic to enumerate only relevant ones.
132
+ contrib/subtree updates; there are a few more from T. Zheng that
133
+ were posted separately, with an overlap.
134
+
135
+ Expecting a reroll.
136
145
- Waiting for area-experts' help and review.
137
+
138
+* mp/diff-algo-config (2013-01-16) 3 commits
139
+ - diff: Introduce --diff-algorithm command line option
140
+ - config: Introduce diff.algorithm variable
141
+ - git-completion.bash: Autocomplete --minimal and --histogram for git-diff
142
+
143
+ Add diff.algorithm configuration so that the user does not type
144
+ "diff --histogram".
145
+
146
+ Looking better; may want tests to protect it from future breakages,
147
+ but otherwise it looks ready for 'next'.
148
+
149
+ Expecting a follow-up to add tests.
150
+
151
+
152
+* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
153
+ - Highlight the link target line in Gitweb using CSS
154
+
155
+ Expecting a reroll.
156
+ $gmane/211935
157
158
159
* jl/submodule-deinit (2012-12-04) 1 commit
@@ -271,46 +282,178 @@ repositories listed at
282
--------------------------------------------------
283
[Cooking]
284
285
+* mp/complete-paths (2013-01-11) 1 commit
286
+ (merged to 'next' on 2013-01-30 at 70e4f1a)
287
+ + git-completion.bash: add support for path completion
288
+
289
+ The completion script used to let the default completer to suggest
290
+ pathnames, which gave too many irrelevant choices (e.g. "git add"
291
+ would not want to add an unmodified path). Teach it to use a more
292
+ git-aware logic to enumerate only relevant ones.
293
+
294
+ This is logically the right thing to do, and we would really love
295
+ to see people who have been involved in completion code to review
296
+ and comment on the implementation.
297
+
298
+ Will cook in 'next' to see if anybody screams.
299
+
300
+
301
+* bc/git-p4-for-python-2.4 (2013-01-26) 2 commits
302
+ (merged to 'next' on 2013-01-30 at 5d81ed2)
303
+ + git-p4.py: support Python 2.4
304
+ + git-p4.py: support Python 2.5
305
+
306
+ With small updates to remove dependency on newer features of
307
+ Python, keep git-p4 usable with older Python.
308
+
309
+ Will merge to 'master'.
310
+
311
+
312
+* jk/gc-auto-after-fetch (2013-01-26) 1 commit
313
+ (merged to 'next' on 2013-01-30 at 472d07b)
314
+ + Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch
315
+ (this branch uses jk/maint-gc-auto-after-fetch.)
316
+
317
+ This is to resolve merge conflicts early for the same topic to
318
+ recent codebase.
319
+
320
+ Will merge to 'master'.
321
+
322
+
323
+* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits
324
+ + fetch-pack: avoid repeatedly re-scanning pack directory
325
+ + fetch: run gc --auto after fetching
326
+ (this branch is used by jk/gc-auto-after-fetch.)
327
+
328
+ Help "fetch only" repositories that do not trigger "gc --auto"
329
+ often enough.
330
+
331
+ Will merge to 'master' via jk/gc-auto-after-fetch and later merge to 'maint'.
332
+
333
+
334
+* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits
335
+ (merged to 'next' on 2013-01-30 at c6d7e16)
336
+ + logmsg_reencode: lazily load missing commit buffers
337
+ + logmsg_reencode: never return NULL
338
+ + commit: drop useless xstrdup of commit message
339
+
340
+ Clarify the ownership rule for commit->buffer field, which some
341
+ callers incorrectly accessed without making sure it is populated.
342
+
343
+ Will merge to 'master'.
344
+
345
+
346
+* pw/git-p4-on-cygwin (2013-01-26) 21 commits
347
+ (merged to 'next' on 2013-01-30 at 958ae3a)
348
+ + git p4: introduce gitConfigBool
349
+ + git p4: avoid shell when calling git config
350
+ + git p4: avoid shell when invoking git config --get-all
351
+ + git p4: avoid shell when invoking git rev-list
352
+ + git p4: avoid shell when mapping users
353
+ + git p4: disable read-only attribute before deleting
354
+ + git p4 test: use test_chmod for cygwin
355
+ + git p4: cygwin p4 client does not mark read-only
356
+ + git p4 test: avoid wildcard * in windows
357
+ + git p4 test: use LineEnd unix in windows tests too
358
+ + git p4 test: newline handling
359
+ + git p4: scrub crlf for utf16 files on windows
360
+ + git p4: remove unreachable windows \r\n conversion code
361
+ + git p4 test: translate windows paths for cygwin
362
+ + git p4 test: start p4d inside its db dir
363
+ + git p4 test: use client_view in t9806
364
+ + git p4 test: avoid loop in client_view
365
+ + git p4 test: use client_view to build the initial client
366
+ + git p4: generate better error message for bad depot path
367
+ + git p4: remove unused imports
368
+ + git p4: temp branch name should use / even on windows
369
+
370
+ Improve "git p4" on Cygwin.
371
+
372
+ Will merge to 'master'.
373
+
374
+
375
+* ss/mergetools-tortoise (2013-01-26) 2 commits
376
+ - mergetools: allow passing pathnames with SP in them to TortoiseGitMerge
377
+ - mergetools: support TortoiseGitMerge
378
+
379
+ Update mergetools to work better with newer merge helper tortoise ships.
380
+
381
+ Will merge to 'next'.
382
+
383
+
384
+* da/mergetool-docs (2013-01-30) 4 commits
385
+ - doc: generate a list of valid merge tools
386
+ - mergetool--lib: add functions for finding available tools
387
+ - mergetool--lib: improve the help text in guess_merge_tool()
388
+ - mergetool--lib: simplify command expressions
389
+ (this branch uses jk/mergetool.)
390
+
391
+ Build on top of the clean-up done by jk/mergetool and automatically
392
+ generate the list of mergetool and difftool backends the build
393
+ supports to be included in the documentation.
394
+
395
+ This is looking ready for 'next'.
396
+
397
+
398
+* nd/branch-error-cases (2013-01-30) 4 commits
399
+ - branch: mark more strings for translation
400
+ - Merge branch 'nd/edit-branch-desc-while-detached' into HEAD
401
+ - branch: give a more helpful message on redundant arguments
402
+ - branch: reject -D/-d without branch name
403
+ (this branch uses nd/edit-branch-desc-while-detached.)
404
+
405
+ Fix various error messages and conditions in "git branch", e.g. we
406
+ advertised "branch -d/-D" to remove one or more branches but actually
407
+ implemented removal of zero or more branches---request to remove no
408
+ branches was not rejected.
409
+
410
+ Will merge to 'next'.
411
+
412
+
413
* jc/push-reject-reasons (2013-01-24) 4 commits
275
- - push: finishing touches to explain REJECT_ALREADY_EXISTS better
276
- - push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
277
- - push: further simplify the logic to assign rejection reason
278
- - push: further clean up fields of "struct ref"
414
+ (merged to 'next' on 2013-01-28 at b60be93)
415
+ + push: finishing touches to explain REJECT_ALREADY_EXISTS better
416
+ + push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
417
+ + push: further simplify the logic to assign rejection reason
418
+ + push: further clean up fields of "struct ref"
419
420
Improve error and advice messages given locally when "git push"
421
refuses when it cannot compute fast-forwardness by separating these
422
cases from the normal "not a fast-forward; merge first and push
423
again" case.
424
285
- Will merge to 'next'.
425
+ Will merge to 'master'.
426
427
428
* as/test-cleanup (2013-01-24) 1 commit
289
- - t7102 (reset): don't hardcode SHA-1 in expected outputs
429
+ (merged to 'next' on 2013-01-28 at cc1147d)
430
+ + t7102 (reset): don't hardcode SHA-1 in expected outputs
431
291
- Will merge to 'next'.
432
+ Will merge to 'master'.
433
434
435
* jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit
295
- - t9902: protect test from stray build artifacts
436
+ (merged to 'next' on 2013-01-28 at df27f53)
437
+ + t9902: protect test from stray build artifacts
438
439
Scripts to test bash completion was inherently flaky as it was
440
affected by whatever random things the user may have on $PATH.
441
300
- Will merge to 'next'.
442
+ Will merge to 'master'.
443
444
445
* jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit
304
- - git-cvsimport.txt: cvsps-2 is deprecated
446
+ (merged to 'next' on 2013-01-28 at fef4eb2)
447
+ + git-cvsimport.txt: cvsps-2 is deprecated
448
449
Warn people that other tools are more recommendable over
450
cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport
451
will not work with cvsps3.
452
310
- Will merge to 'next'.
453
+ Will merge to 'master'.
454
455
313
-* jk/mergetool (2013-01-27) 8 commits
456
+* jk/mergetool (2013-01-28) 8 commits
457
- mergetools: simplify how we handle "vim" and "defaults"
458
- mergetool--lib: don't call "exit" in setup_tool
459
- mergetool--lib: improve show_tool_help() output
@@ -323,89 +466,44 @@ repositories listed at
466
467
Cleans up mergetool/difftool combo.
468
326
- Will merge to 'next'.
469
+ This is looking ready for 'next'.
470
471
472
* jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit
330
- - ident: do not drop username when reading from /etc/mailname
473
+ (merged to 'next' on 2013-01-28 at e0a8222)
474
+ + ident: do not drop username when reading from /etc/mailname
475
476
We used to stuff "user@" and then append what we read from
477
/etc/mailname to come up with a default e-mail ident, but a bug
478
lost the "user@" part. This is to fix it.
479
336
- Will merge to 'next'.
480
+ Will merge to 'master'.
481
482
339
-* mm/add-u-A-sans-pathspec (2013-01-25) 1 commit
340
- - add: warn when -u or -A is used without pathspec
483
+* mm/add-u-A-sans-pathspec (2013-01-28) 1 commit
484
+ (merged to 'next' on 2013-01-28 at fe762a6)
485
+ + add: warn when -u or -A is used without pathspec
486
487
Forbid "git add -u" and "git add -A" without pathspec run from a
488
subdirectory, to train people to type "." (or ":/") to make the
489
choice of default does not matter.
490
346
- Will merge to 'next'.
347
-
348
-
349
-* bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit
350
- (merged to 'next' on 2013-01-25 at d113c1a)
351
- + git-completion.bash: replace zsh notation that breaks bash 3.X
352
-
353
- Fix use of an array notation that older versions of bash do not
354
- understand.
355
-
491
Will merge to 'master'.
492
493
359
-* jc/help (2013-01-18) 1 commit
360
- (merged to 'next' on 2013-01-25 at b2b087e)
361
- + help: include <common-cmds.h> only in one file
362
-
363
- A header file that has the definition of a static array was
364
- included in two places, wasting the space.
365
-
366
- Will merge to 'master'.
367
-
368
-
369
-* jc/hidden-refs (2013-01-18) 2 commits
370
- - upload-pack: allow hiding ref hiearchies
494
+* jc/hidden-refs (2013-01-30) 8 commits
495
+ - WIP: receive.allowupdatestohidden
496
+ - fetch: fetch objects by their exact SHA-1 object names
497
+ - upload-pack: optionally allow fetching from the tips of hidden refs
498
+ - fetch: use struct ref to represent refs to be fetched
499
+ - parse_fetch_refspec(): clarify the codeflow a bit
500
+ - upload/receive-pack: allow hiding ref hierarchies
501
+ - upload-pack: simplify request validation
502
- upload-pack: share more code
503
373
- Allow the server side to unclutter the refs/ namespace it shows by
374
- default, while still allowing requests for histories leading to the
375
- tips of hidden refs by updated clients (which are not written yet).
376
-
377
-
378
-* jk/update-install-for-p4 (2013-01-20) 1 commit
379
- - INSTALL: git-p4 doesn't support Python 3
380
-
381
- Will merge to 'next'.
382
-
383
-
384
-* tb/t0050-maint (2013-01-21) 3 commits
385
- (merged to 'next' on 2013-01-25 at 682b1e2)
386
- + t0050: Use TAB for indentation
387
- + t0050: honor CASE_INSENSITIVE_FS in add (with different case)
388
- + t0050: known breakage vanished in merge (case change)
389
-
390
- Update tests that were expecting to fail due to a bug that was
391
- fixed earlier.
392
-
393
- Will merge to 'master'.
394
-
395
-
396
-* nd/magic-pathspec-from-root (2013-01-21) 2 commits
397
- (merged to 'next' on 2013-01-25 at b056b57)
398
- + grep: avoid accepting ambiguous revision
399
- + Update :/abc ambiguity check
400
-
401
- When giving arguments without "--" disambiguation, object names
402
- that come earlier on the command line must not be interpretable as
403
- pathspecs and pathspecs that come later on the command line must
404
- not be interpretable as object names. Tweak the disambiguation
405
- rule so that ":/" (no other string before or after) is always
406
- interpreted as a pathspec, to avoid having to say "git cmd -- :/".
407
-
408
- Will merge to 'master'.
504
+ Allow the server side to unclutter the refs/ namespace it shows to
505
+ the client. Optionally allow requests for histories leading to the
506
+ tips of hidden refs by updated clients.
507
508
509
* ta/doc-no-small-caps (2013-01-22) 10 commits
@@ -431,36 +529,24 @@ repositories listed at
529
to 'next'.
530
531
434
-* rr/minimal-stat (2013-01-22) 1 commit
435
- (merged to 'next' on 2013-01-25 at 11c4453)
436
- + Enable minimal stat checking
437
-
438
- Some reimplementations of Git does not write all the stat info back
439
- to the index due to their implementation limitations (e.g. jgit
440
- running on Java). A configuration option can tell Git to ignore
441
- changes to most of the stat fields and only pay attention to mtime
442
- and size, which these implementations can reliably update. This
443
- avoids excessive revalidation of contents.
444
-
445
- Will merge to 'master'.
446
-
447
-
532
* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
449
- - simplify-merges: drop merge from irrelevant side branch
533
+ (merged to 'next' on 2013-01-30 at b639b47)
534
+ + simplify-merges: drop merge from irrelevant side branch
535
536
The --simplify-merges logic did not cull irrelevant parents from a
537
merge that is otherwise not interesting with respect to the paths
538
we are following.
539
455
- As this touches a fairly core part of the revision traversal
456
- infrastructure, it is appreciated to have an extra set of eyes for
457
- sanity check.
540
+ This touches a fairly core part of the revision traversal
541
+ infrastructure; even though I think this change is correct, please
542
+ report immediately if you find any unintended side effect.
543
544
Will merge to 'next'.
545
546
462
-* jk/remote-helpers-in-python-3 (2013-01-27) 9 commits
463
- - git-remote-testpy: fix path hashing on Python 3
547
+* jk/remote-helpers-in-python-3 (2013-01-28) 9 commits
548
+ (merged to 'next' on 2013-01-28 at d898471)
549
+ + git-remote-testpy: fix path hashing on Python 3
550
(merged to 'next' on 2013-01-25 at acf9419)
551
+ git-remote-testpy: call print as a function
552
+ git-remote-testpy: don't do unbuffered text I/O
@@ -473,49 +559,25 @@ repositories listed at
559
560
Prepare remote-helper test written in Python to be run with Python3.
561
476
- Waiting for the final review and Ack, perhaps from Michael.
477
-
478
-
479
-* dl/am-hg-locale (2013-01-18) 1 commit
480
- (merged to 'next' on 2013-01-25 at 3419019)
481
- + am: invoke perl's strftime in C locale
482
-
483
- Datestamp recorded in "Hg" format patch was reformatted incorrectly
484
- to an e-mail looking date using locale dependant strftime, causing
485
- patch application to fail.
486
-
562
Will merge to 'master'.
563
564
565
* jk/config-parsing-cleanup (2013-01-23) 8 commits
491
- - reflog: use parse_config_key in config callback
492
- - help: use parse_config_key for man config
493
- - submodule: simplify memory handling in config parsing
494
- - submodule: use parse_config_key when parsing config
495
- - userdiff: drop parse_driver function
496
- - convert some config callbacks to parse_config_key
497
- - archive-tar: use parse_config_key when parsing config
498
- - config: add helper function for parsing key names
566
+ (merged to 'next' on 2013-01-28 at 9bc9411)
567
+ + reflog: use parse_config_key in config callback
568
+ + help: use parse_config_key for man config
569
+ + submodule: simplify memory handling in config parsing
570
+ + submodule: use parse_config_key when parsing config
571
+ + userdiff: drop parse_driver function
572
+ + convert some config callbacks to parse_config_key
573
+ + archive-tar: use parse_config_key when parsing config
574
+ + config: add helper function for parsing key names
575
576
Configuration parsing for tar.* configuration variables were
577
broken. Introduce a new config-keyname parser API to make the
578
callers much less error prone.
579
504
- Will merge to 'next'.
505
-
506
-
507
-* mp/diff-algo-config (2013-01-16) 3 commits
508
- - diff: Introduce --diff-algorithm command line option
509
- - config: Introduce diff.algorithm variable
510
- - git-completion.bash: Autocomplete --minimal and --histogram for git-diff
511
-
512
- Add diff.algorithm configuration so that the user does not type
513
- "diff --histogram".
514
-
515
- Looking better; may want tests to protect it from future breakages,
516
- but otherwise it looks ready for 'next'.
517
-
518
- Expecting a follow-up to add tests.
580
+ Will merge to 'master'.
581
582
583
* jc/custom-comment-char (2013-01-16) 1 commit
@@ -532,7 +594,7 @@ repositories listed at
594
converted (it should not matter, as the file is not really a
595
free-form text).
596
535
- I don't know how useful this will be in real life, though.
597
+ Will merge to 'master'.
598
599
600
* nd/fetch-depth-is-broken (2013-01-11) 3 commits
@@ -546,7 +608,7 @@ repositories listed at
608
unclear how to wipe the shallowness of the repository with the
609
command, and documentation was misleading.
610
549
- Will cook in 'next'.
611
+ Will merge to 'master'.
612
613
614
* jc/no-git-config-in-clone (2013-01-11) 1 commit
@@ -558,22 +620,7 @@ repositories listed at
620
quite a while ago, but "git clone" internally set, exported, and
621
then unexported the variable during its operation unnecessarily.
622
561
- Will cook in 'next'.
562
-
563
-
564
-* dg/subtree-fixes (2013-01-08) 7 commits
565
- - contrib/subtree: mkdir the manual directory if needed
566
- - contrib/subtree: honor $(DESTDIR)
567
- - contrib/subtree: fix synopsis and command help
568
- - contrib/subtree: better error handling for "add"
569
- - contrib/subtree: add --unannotate option
570
- - contrib/subtree: use %B for split Subject/Body
571
- - t7900: remove test number comments
572
-
573
- contrib/subtree updates; there are a few more from T. Zheng that
574
- were posted separately, with an overlap.
575
-
576
- Expecting a reroll.
623
+ Will merge to 'master'.
624
625
626
* jc/push-2.0-default-to-simple (2013-01-16) 14 commits
@@ -597,13 +644,6 @@ repositories listed at
644
Will cook in 'next' until Git 2.0 ;-).
645
646
600
-* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
601
- - Highlight the link target line in Gitweb using CSS
602
-
603
- Expecting a reroll.
604
- $gmane/211935
605
-
606
-
647
* bc/append-signed-off-by (2013-01-27) 11 commits
648
- Unify appending signoff in format-patch, commit and sequencer
649
- format-patch: update append_signoff prototype
@@ -619,4 +659,10 @@ repositories listed at
659
660
Rerolled. With help from Jonathan, I think this is getting closer.
661
662
+--------------------------------------------------
663
+[Discarded]
664
+
665
+* jk/update-install-for-p4 (2013-01-20) 1 commit
666
+ . INSTALL: git-p4 doesn't support Python 3
667
668
+ Made obsolete by bc/git-p4-for-python-2.4 topic.