What's cooking (2014/08 #01)
Junio C Hamano committed
Aug 1, 2014 at 15:00 UTC
3d84dcf9136e737c8a8d10b7954928df732dadca
1 file changed
+163
-128
whats-cooking.txt
+163
-128
@@ -1,16 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2014, #06; Tue, 29)
4
-X-master-at: 583b61c1af1bac12d6b48b2583ad508b5ab9964c
5
-X-next-at: fbdcabe3ee4652186b0b2370eb0646ec0abf433e
3
+Subject: What's cooking in git.git (Aug 2014, #01; Fri, 1)
4
+X-master-at: aa544bfbc6eb11e4f0471f3144d3e3ac75c0e4a9
5
+X-next-at: 6a8ef70a0a7fa126e4e0002b8f284fdec4c0f9a3
6
7
-What's cooking in git.git (Jul 2014, #06; Tue, 29)
7
+What's cooking in git.git (Aug 2014, #01; Fri, 1)
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
+First release candidate 2.1.0-rc1 expected early next week, after
15
+merging a couple of obvious documentation update patches.
16
+
17
You can find the changes described here in the integration branches
18
of the repositories listed at
19
@@ -19,71 +22,126 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
22
-* cc/replace-graft (2014-07-21) 9 commits
23
- (merged to 'next' on 2014-07-22 at 9b14090)
24
- + replace: add test for --graft with a mergetag
25
- + replace: check mergetags when using --graft
26
- + replace: add test for --graft with signed commit
27
- + replace: remove signature when using --graft
28
- + contrib: add convert-grafts-to-replace-refs.sh
29
- + Documentation: replace: add --graft option
30
- + replace: add test for --graft
31
- + replace: add --graft option
32
- + replace: cleanup redirection style in tests
25
+* ep/avoid-test-a-o (2014-07-25) 1 commit
26
+ (merged to 'next' on 2014-07-27 at 45de31d)
27
+ + t9814: fix misconversion from test $a -o $b to test $a || test $b
28
34
- "git replace" learned a "--graft" option to rewrite parents of a
35
- commit.
29
+ Fix a post v2.0 regression in 'master'.
30
31
38
-* jk/misc-fixes-maint (2014-07-24) 5 commits
39
- (merged to 'next' on 2014-07-27 at 321a77c)
40
- + apply: avoid possible bogus pointer
41
- + fix memory leak parsing core.commentchar
42
- + transport: fix leaks in refs_from_alternate_cb
43
- + free ref string returned by dwim_ref
44
- + receive-pack: don't copy "dir" parameter
32
+* jk/more-push-completion (2014-07-22) 3 commits
33
+ (merged to 'next' on 2014-07-28 at d1d4c27)
34
+ + completion: complete `git push --force-with-lease=`
35
+ + completion: add some missing options to `git push`
36
+ + completion: complete "unstuck" `git push --recurse-submodules`
37
46
- Miscellaneous fixes.
38
39
+* sk/mingw-tests-workaround (2014-07-21) 6 commits
40
+ (merged to 'next' on 2014-07-28 at 2f3b7ac)
41
+ + t800[12]: work around MSys limitation
42
+ + t9902: mingw-specific fix for gitfile link files
43
+ + t4210: skip command-line encoding tests on mingw
44
+ + MinGW: disable legacy encoding tests
45
+ + t0110/MinGW: skip tests that pass arbitrary bytes on the command line
46
+ + MinGW: Skip test redirecting to fd 4
47
+ (this branch is used by jc/not-mingw-cygwin.)
48
49
-* jk/rebase-am-fork-point (2014-07-16) 2 commits
50
- (merged to 'next' on 2014-07-22 at 7648293)
51
- + rebase: omit patch-identical commits with --fork-point
52
- + rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
49
+ Make tests pass on msysgit by mostly disabling ones that are
50
+ infeasible on that platform.
51
54
- "git rebase --fork-point" did not filter out patch-identical
55
- commits correctly.
52
53
+* sk/mingw-uni-fix-more (2014-07-21) 14 commits
54
+ (merged to 'next' on 2014-07-28 at 0945196)
55
+ + Win32: enable color output in Windows cmd.exe
56
+ + Win32: patch Windows environment on startup
57
+ + Win32: keep the environment sorted
58
+ + Win32: use low-level memory allocation during initialization
59
+ + Win32: reduce environment array reallocations
60
+ + Win32: don't copy the environment twice when spawning child processes
61
+ + Win32: factor out environment block creation
62
+ + Win32: unify environment function names
63
+ + Win32: unify environment case-sensitivity
64
+ + Win32: fix environment memory leaks
65
+ + Win32: Unicode environment (incoming)
66
+ + Win32: Unicode environment (outgoing)
67
+ + Revert "Windows: teach getenv to do a case-sensitive search"
68
+ + tests: do not pass iso8859-1 encoded parameter
69
58
-* jk/stable-prio-queue (2014-07-15) 4 commits
59
- (merged to 'next' on 2014-07-22 at 46e9bc3)
60
- + t5539: update a flaky test
61
- + paint_down_to_common: use prio_queue
62
- + prio-queue: make output stable with respect to insertion
63
- + prio-queue: factor out compare and swap operations
70
+ Most of these are battle-tested in msysgit and are needed to
71
+ complete what has been merged to 'master' already.
72
73
--------------------------------------------------
74
[New Topics]
75
68
-* ep/avoid-test-a-o (2014-07-25) 1 commit
69
- (merged to 'next' on 2014-07-27 at 45de31d)
70
- + t9814: fix misconversion from test $a -o $b to test $a || test $b
76
+* jk/stash-list-p (2014-07-30) 7 commits
77
+ - SQUASH??? future-proof, log --cc should imply -p without being told
78
+ - stash: show combined diff with "stash show"
79
+ - stash: default listing to "--cc --simplify-combined-diff"
80
+ - add --simplify-combined-diff option
81
+ - pretty: make empty userformats truly empty
82
+ - pretty: treat "--format=" as an empty userformat
83
+ - revision: drop useless string offset when parsing "--pretty"
84
+
85
+ Teach "git stash list -p" to DWIM to "git stash list -p --cc", with
86
+ even nicer twist to collapse combined diff from identical two
87
+ parents into a regular diff.
88
+
89
+
90
+* pr/remotes-in-hashmap (2014-07-30) 1 commit
91
+ - use a hashmap to make remotes faster
92
+
93
+ Optimize remotes configuration look-up in a repository with very
94
+ many remotes defined.
95
+
96
+
97
+* rs/ref-transaction-multi (2014-07-31) 5 commits
98
+ - refs.c: make the *_packed_refs functions static
99
+ - refs.c: make repack_without_refs static
100
+ - remote.c: use a transaction for deleting refs
101
+ - refs.c: write updates to packed refs when a transaction has more than one ref
102
+ - refs.c: move reflog updates into its own function
103
+ (this branch uses rs/ref-transaction, rs/ref-transaction-1, rs/ref-transaction-reflog and rs/ref-transaction-rename.)
104
+
105
+ Follow-up on rs/ref-transaction series to use the packed-ref to
106
+ achieve atomicity when multiple refs are involved.
107
+
108
+
109
+* rs/ref-transaction-rename (2014-07-31) 5 commits
110
+ - refs.c: rollback the lockfile before we die() in repack_without_refs
111
+ - refs.c: update rename_ref to use a transaction
112
+ - refs.c: use packed refs when deleting refs during a transaction
113
+ - refs.c: return error instead of dying when locking fails during transaction
114
+ - refs.c: allow passing raw git_committer_info as email to _update_reflog
115
+ (this branch is used by rs/ref-transaction-multi; uses rs/ref-transaction, rs/ref-transaction-1 and rs/ref-transaction-reflog.)
116
+
117
+ Follow-up on rs/ref-transaction series to make renaming a ref
118
+ transactional (i.e. "delete old and create new" should not leave
119
+ an in-between state behind when it fails).
120
+
121
+
122
+* ta/doc-config (2014-07-30) 1 commit
123
+ (merged to 'next' on 2014-07-31 at ec577fa)
124
+ + add documentation for writing config files
125
126
Will merge to 'master'.
127
128
75
-* mm/config-edit-global (2014-07-25) 3 commits
76
- - commit: advertise config --global --edit on guessed identity
77
- - home_config_paths(): let the caller ignore xdg path
78
- - config --global --edit: create a template file if needed
129
+* tf/maint-doc-push (2014-07-31) 1 commit
130
+ (merged to 'next' on 2014-07-31 at 6a8ef70)
131
+ + git-push: fix link in man page
132
80
- Will merge to 'next'.
133
+ Will merge to 'master' and later to 'maint'.
134
135
83
-* rs/init-no-duplicate-real-path (2014-07-28) 1 commit
84
- - init: avoid superfluous real_path() calls
136
+* nd/lock-paths-absolute (2014-08-01) 3 commits
137
+ - lockfile.c: store absolute path
138
+ - lockfile.c: remove PATH_MAX limit in resolve_symlink()
139
+ - lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)
140
+ (this branch uses rs/strbuf-getcwd.)
141
+
142
86
- Will merge to 'next'.
143
+* mm/config-message-i18n (2014-08-01) 1 commit
144
+ - config.c: mark error and warnings strings for translation
145
146
--------------------------------------------------
147
[Stalled]
@@ -303,18 +361,26 @@ of the repositories listed at
361
--------------------------------------------------
362
[Cooking]
363
306
-* nd/multiple-work-trees-1 (2014-07-29) 8 commits
307
- - checkout --to: do not touch existing target directory
308
- - checkout: prefix --to argument properly when cwd is moved
309
- - environment.c: fix incorrect git_graft_file initialization
310
- - checkout --to: fix dangling pointers in remove_junk()
311
- - checkout: no auto-detach if the ref is already checked out
312
- - prune --repos: fix uninitialized access
313
- - checkout: no need to call check_linked_checkouts if head_ref is NULL
314
- - gitrepository-layout.txt: s/ignored/ignored if/
315
- (this branch uses nd/multiple-work-trees.)
364
+* mm/config-edit-global (2014-07-25) 3 commits
365
+ (merged to 'next' on 2014-07-31 at ecce1c7)
366
+ + commit: advertise config --global --edit on guessed identity
367
+ + home_config_paths(): let the caller ignore xdg path
368
+ + config --global --edit: create a template file if needed
369
317
- Continue polishing nd/multiple-work-trees topic in 'next'.
370
+ Start "git config --edit --global" from a skeletal per-user
371
+ configuration file contents, instead of a total blank, when the
372
+ user does not already have any. This immediately reduces the need
373
+ for a later "Have you forgotten setting core.user?" and we can add
374
+ more to the template as we gain more experience.
375
+
376
+ Will cook in 'next'.
377
+
378
+
379
+* rs/init-no-duplicate-real-path (2014-07-28) 1 commit
380
+ (merged to 'next' on 2014-07-31 at 683112e)
381
+ + init: avoid superfluous real_path() calls
382
+
383
+ Will cook in 'next'.
384
385
386
* rs/ref-transaction-reflog (2014-07-23) 15 commits
@@ -339,75 +405,31 @@ of the repositories listed at
405
for reflog manipulations.
406
407
342
-* nd/path-max-is-better-than-hardcoded-magic-1024 (2014-07-17) 1 commit
343
- - abspath.c: use PATH_MAX in real_path_internal()
344
-
345
- Will drop; rs/strbuf-getcwd topic covers this codepath.
346
-
347
-
348
-* sk/mingw-uni-fix-more (2014-07-21) 14 commits
349
- (merged to 'next' on 2014-07-28 at 0945196)
350
- + Win32: enable color output in Windows cmd.exe
351
- + Win32: patch Windows environment on startup
352
- + Win32: keep the environment sorted
353
- + Win32: use low-level memory allocation during initialization
354
- + Win32: reduce environment array reallocations
355
- + Win32: don't copy the environment twice when spawning child processes
356
- + Win32: factor out environment block creation
357
- + Win32: unify environment function names
358
- + Win32: unify environment case-sensitivity
359
- + Win32: fix environment memory leaks
360
- + Win32: Unicode environment (incoming)
361
- + Win32: Unicode environment (outgoing)
362
- + Revert "Windows: teach getenv to do a case-sensitive search"
363
- + tests: do not pass iso8859-1 encoded parameter
364
-
365
- Most of these are battle-tested in msysgit and are needed to
366
- complete what has been merged to 'master' already.
367
-
368
- Will merge to 'master'.
369
-
370
-
371
-* sk/mingw-tests-workaround (2014-07-21) 6 commits
372
- (merged to 'next' on 2014-07-28 at 2f3b7ac)
373
- + t800[12]: work around MSys limitation
374
- + t9902: mingw-specific fix for gitfile link files
375
- + t4210: skip command-line encoding tests on mingw
376
- + MinGW: disable legacy encoding tests
377
- + t0110/MinGW: skip tests that pass arbitrary bytes on the command line
378
- + MinGW: Skip test redirecting to fd 4
379
- (this branch is used by jc/not-mingw-cygwin.)
380
-
381
- Make tests pass on msysgit by mostly disabling ones that are
382
- infeasible on that platform.
383
-
384
- Will merge to 'master'.
385
-
386
-
408
* cb/mergetool-difftool (2014-07-21) 2 commits
409
- difftool: don't assume that default sh is sane
410
- mergetool: don't require a work tree for --tool-help
411
412
413
* rs/strbuf-getcwd (2014-07-29) 10 commits
393
- - use strbuf_add_absolute_path() to add absolute paths
394
- - abspath: convert absolute_path() to strbuf
395
- - use xgetcwd() to set $GIT_DIR
396
- - use xgetcwd() to get the current directory or die
397
- - wrapper: add xgetcwd()
398
- - abspath: convert real_path_internal() to strbuf
399
- - abspath: use strbuf_getcwd() to remember original working directory
400
- - setup: convert setup_git_directory_gently_1 et al. to strbuf
401
- - unix-sockets: use strbuf_getcwd()
402
- - strbuf: add strbuf_getcwd()
414
+ (merged to 'next' on 2014-07-31 at 6edc3bc)
415
+ + use strbuf_add_absolute_path() to add absolute paths
416
+ + abspath: convert absolute_path() to strbuf
417
+ + use xgetcwd() to set $GIT_DIR
418
+ + use xgetcwd() to get the current directory or die
419
+ + wrapper: add xgetcwd()
420
+ + abspath: convert real_path_internal() to strbuf
421
+ + abspath: use strbuf_getcwd() to remember original working directory
422
+ + setup: convert setup_git_directory_gently_1 et al. to strbuf
423
+ + unix-sockets: use strbuf_getcwd()
424
+ + strbuf: add strbuf_getcwd()
425
+ (this branch is used by nd/lock-paths-absolute.)
426
404
- Will merge to 'next'.
427
+ Will cook in 'next'.
428
429
430
* jc/not-mingw-cygwin (2014-07-21) 2 commits
431
- test prerequisites: enumerate with commas
432
- test prerequisites: eradicate NOT_FOO
410
- (this branch uses sk/mingw-tests-workaround.)
433
434
We have been using NOT_{MINGW,CYGWIN} test prerequisites long
435
before Peff invented support for negated prerequisites e.g. !MINGW
@@ -415,21 +437,12 @@ of the repositories listed at
437
latter to avoid confusion.
438
439
418
-* jk/more-push-completion (2014-07-22) 3 commits
419
- (merged to 'next' on 2014-07-28 at d1d4c27)
420
- + completion: complete `git push --force-with-lease=`
421
- + completion: add some missing options to `git push`
422
- + completion: complete "unstuck" `git push --recurse-submodules`
423
-
424
- Will merge to 'master'.
425
-
426
-
440
* ta/config-set (2014-07-29) 2 commits
441
- test-config: add tests for the config_set API
442
- add `config_set` API for caching config-like files
443
431
- More or less solidified enough to be built other enhancements upon.
432
- Will merge to 'next'.
444
+ Add in-core caching layer to let us avoid reading the same
445
+ configuration files number of times.
446
447
448
* rs/ref-transaction-1 (2014-07-16) 20 commits
@@ -463,7 +476,9 @@ of the repositories listed at
476
+ lockfile: allow reopening a closed but still locked file
477
478
Needed in the "commit -p" code path to update the cache tree in the
466
- index.
479
+ index (e.g. for dt/cache-tree-repair topic).
480
+
481
+ Will cook in 'next'.
482
483
484
* nd/multiple-work-trees (2014-07-17) 31 commits
@@ -508,6 +523,20 @@ of the repositories listed at
523
Will cook in 'next'.
524
525
526
+* nd/multiple-work-trees-1 (2014-07-29) 8 commits
527
+ - checkout --to: do not touch existing target directory
528
+ - checkout: prefix --to argument properly when cwd is moved
529
+ - environment.c: fix incorrect git_graft_file initialization
530
+ - checkout --to: fix dangling pointers in remove_junk()
531
+ - checkout: no auto-detach if the ref is already checked out
532
+ - prune --repos: fix uninitialized access
533
+ - checkout: no need to call check_linked_checkouts if head_ref is NULL
534
+ - gitrepository-layout.txt: s/ignored/ignored if/
535
+ (this branch uses nd/multiple-work-trees.)
536
+
537
+ Continue polishing nd/multiple-work-trees topic in 'next'.
538
+
539
+
540
* dt/cache-tree-repair (2014-07-14) 4 commits
541
(merged to 'next' on 2014-07-21 at e83db34)
542
+ cache-tree: Write updated cache-tree after commit
@@ -570,3 +599,9 @@ of the repositories listed at
599
600
* jh/submodule-tests (2014-04-17) 1 commit
601
. t7410: 210 tests for various 'git submodule update' scenarios
602
+
603
+
604
+* nd/path-max-is-better-than-hardcoded-magic-1024 (2014-07-17) 1 commit
605
+ . abspath.c: use PATH_MAX in real_path_internal()
606
+
607
+ rs/strbuf-getcwd topic covers this codepath in a better way.