What's cooking (2011/04 #02)
Junio C Hamano committed
Apr 6, 2011 at 13:01 UTC
9b460ad3e9461ec26a7bad65fe892b9b33ffea8f
1 file changed
+103
-209
whats-cooking.txt
+103
-209
@@ -1,188 +1,89 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2011, #01; Sun, 3)
3
-X-master-at: 44bc573436c98b7c6cd798af04c538f6e76f0f6e
4
-X-next-at: c63fac87daebf1437e8dc8c7ead5a4c7cadf15e0
2
+Subject: What's cooking in git.git (Apr 2011, #02; Wed, 6)
3
+X-master-at: 6be0559183ac0b40680df314748141d1bdf28e41
4
+X-next-at: 00b8c7c14947fdc050aa2896ceffcc245873ec3e
5
6
-What's cooking in git.git (Apr 2011, #01; Sun, 3)
6
+What's cooking in git.git (Apr 2011, #02; Wed, 6)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-Hopefully we will have 1.7.5-rc1 coming Wednesday.
12
+The tip of 'master' is at 1.7.5-rc1 now.
13
14
--------------------------------------------------
15
[New Topics]
16
17
-* ar/clean-rmdir-empty (2011-04-01) 1 commit
18
- (merged to 'next' on 2011-04-03 at c63fac8)
19
- + clean: unreadable directory may still be rmdir-able if it is empty
17
+* dm/http-cleanup (2011-03-30) 2 commits
18
+ - http-push: refactor curl_easy_setup madness
19
+ - http: make curl callbacks match contracts from curl header
20
21
-This should be very safe and Ok to merge before -rc1; it is not urgent,
22
-though.
21
+* jc/pack-objects-bigfile (2011-04-05) 1 commit
22
+ - Teach core.bigfilethreashold to pack-objects
23
24
-* jc/rev-list-options-fix (2011-04-01) 1 commit
25
- (merged to 'next' on 2011-04-03 at 91f19de)
26
- + "log --cherry-pick" documentation regression fix
24
+* jk/maint-stash-oob (2011-04-06) 2 commits
25
+ - stash: fix false positive in the invalid ref test.
26
+ - stash: fix accidental apply of non-existent stashes
27
28
-We should merge this before -rc1, but there might be other similar
29
-breakages in the text flow due to the same f98fd43 (git-log.txt,
30
-rev-list-options.txt: put option blocks in proper order, 2011-03-08).
28
+* nk/blame-abbrev (2011-04-06) 1 commit
29
+ - blame: add --abbrev command line option and make it honor core.abbrev
30
32
-* jk/maint-push-async-hang (2011-03-31) 4 commits
33
- - send-pack: abort sideband demuxer on pack-objects error
34
- - run-command: allow aborting async code prematurely
35
- - finish_async: be quiet when waiting for async process
36
- - teach wait_or_whine a "quiet" mode
37
- (this branch is used by jk/maint-push-async-hang-threads.)
38
-
39
-* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
40
- - run-command: implement abort_async for pthreads
41
- - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
42
- (this branch uses jk/maint-push-async-hang.)
31
+* nm/submodule-update-force (2011-04-01) 1 commit
32
+ - submodule: Add --force option for git submodule update
33
44
-* mg/doc-revisions-txt (2011-04-01) 3 commits
45
- - revisions.txt: language improvements
46
- - revisions.txt: structure with a labelled list
47
- - revisions.txt: consistent use of quotes
34
+* jk/maint-upload-pack-shallow (2011-04-04) 1 commit
35
+ - [REVISIT] upload-pack deadlock during a shallow clone
36
49
-Most parts looked reasonable except for some nits.
37
+* jk/stash-loosen-safety (2011-04-05) 1 commit
38
+ - stash: drop dirty worktree check on apply
39
51
-* mg/reflog-with-options (2011-04-01) 3 commits
52
- (merged to 'next' on 2011-04-03 at e69a95c)
53
- + reflog: fix overriding of command line options
54
- + t/t1411: test reflog with formats
55
- + builtin/log.c: separate default and setup of cmd_log_init()
56
- (this branch is used by mg/show-without-prune.)
40
+--------------------------------------------------
41
+[Graduated to "master"]
42
58
-Reasonable, but can wait.
43
+* jc/rev-list-options-fix (2011-04-01) 1 commit
44
+ (merged to 'next' on 2011-04-03 at 91f19de)
45
+ + "log --cherry-pick" documentation regression fix
46
60
-* mg/show-without-prune (2011-04-01) 1 commit
61
- - builtin/show: do not prune by pathspec
62
- (this branch uses mg/reflog-with-options.)
47
+* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
48
+ (merged to 'next' on 2011-04-03 at ccc9c1a)
49
+ + remote: deprecate --mirror
50
+ + remote: separate the concept of push and fetch mirrors
51
+ + remote: disallow some nonsensical option combinations
52
64
-I wanted to like this, but it still feels like too much magic.
53
+This avoids a nonsense configuration to be created to confuse unsuspecting
54
+users.
55
66
-* mh/git-svn-automkdirs (2011-04-01) 1 commit
67
- (merged to 'next' on 2011-04-03 at 7fa4978)
68
- + git-svn: add an option to skip the creation of empty directories
56
+* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
57
+ (merged to 'next' on 2011-03-20 at a5e452d)
58
+ + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
59
+ + submodule update: Don't fetch when the submodule commit is already present
60
+ + fetch/pull: Don't recurse into a submodule when commits are already present
61
+ + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
62
+ + config: teach the fetch.recurseSubmodules option the 'on-demand' value
63
+ + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
64
+ + fetch/pull: recurse into submodules when necessary
65
70
-Should be safe, but I'd like an Ack from git-svn folks.
66
+* mg/doc-revisions-txt (2011-04-04) 3 commits
67
+ (merged to 'next' on 2011-04-04 at ebf3612)
68
+ + revisions.txt: language improvements
69
+ + revisions.txt: structure with a labelled list
70
+ + revisions.txt: consistent use of quotes
71
72
* nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit
73
(merged to 'next' on 2011-04-03 at 40c5094)
74
+ submodule: process conflicting submodules only once
75
76
-A fix to a rather common operation and the implementation looked
77
-low-impact enough. Do submodule people want this in 1.7.5?
78
-
79
-* dm/color-palette (2011-03-30) 1 commit
80
- - Share color list between graph and show-branch
81
-
82
-* mg/sha1-path-advise (2011-03-31) 2 commits
83
- - sha1_name: Suggest commit:./file for path in subdir
84
- - t1506: factor out test for "Did you mean..."
85
-
76
--------------------------------------------------
87
-[Graduated to "master"]
77
+[Stalled]
78
89
-* ab/i18n-st (2011-02-22) 69 commits
90
- (merged to 'next' on 2011-03-23 at e2732e2)
91
- + i18n: git-shortlog basic messages
92
- + i18n: git-revert split up "could not revert/apply" message
93
- + i18n: git-revert literal "me" messages
94
- + i18n: git-revert "Your local changes" message
95
- + i18n: git-revert basic messages
96
- + i18n: git-notes GIT_NOTES_REWRITE_MODE error message
97
- + i18n: git-notes basic commands
98
- + i18n: git-gc "Auto packing the repository" message
99
- + i18n: git-gc basic messages
100
- + i18n: git-describe basic messages
101
- + i18n: git-clean clean.requireForce messages
102
- + i18n: git-clean basic messages
103
- + i18n: git-bundle basic messages
104
- + i18n: git-archive basic messages
105
- + i18n: git-status "renamed: " message
106
- + i18n: git-status "Initial commit" message
107
- + i18n: git-status "Changes to be committed" message
108
- + i18n: git-status shortstatus messages
109
- + i18n: git-status "nothing to commit" messages
110
- + i18n: git-status basic messages
111
- + i18n: git-push "prevent you from losing" message
112
- + i18n: git-push basic messages
113
- + i18n: git-tag tag_template message
114
- + i18n: git-tag basic messages
115
- + i18n: git-reset "Unstaged changes after reset" message
116
- + i18n: git-reset reset_type_names messages
117
- + i18n: git-reset basic messages
118
- + i18n: git-rm basic messages
119
- + i18n: git-mv "bad" messages
120
- + i18n: git-mv basic messages
121
- + i18n: git-merge "Wonderful" message
122
- + i18n: git-merge "You have not concluded your merge" messages
123
- + i18n: git-merge "Updating %s..%s" message
124
- + i18n: git-merge basic messages
125
- + i18n: git-log "--OPT does not make sense" messages
126
- + i18n: git-log basic messages
127
- + i18n: git-grep "--open-files-in-pager" message
128
- + i18n: git-grep basic messages
129
- + i18n: git-fetch split up "(non-fast-forward)" message
130
- + i18n: git-fetch update_local_ref messages
131
- + i18n: git-fetch formatting messages
132
- + i18n: git-fetch basic messages
133
- + i18n: git-diff basic messages
134
- + i18n: git-commit advice messages
135
- + i18n: git-commit "enter the commit message" message
136
- + i18n: git-commit print_summary messages
137
- + i18n: git-commit formatting messages
138
- + i18n: git-commit "middle of a merge" message
139
- + i18n: git-commit basic messages
140
- + i18n: git-checkout "Switched to a .. branch" message
141
- + i18n: git-checkout "HEAD is now at" message
142
- + i18n: git-checkout describe_detached_head messages
143
- + i18n: git-checkout: our/their version message
144
- + i18n: git-checkout basic messages
145
- + i18n: git-branch "(no branch)" message
146
- + i18n: git-branch "git branch -v" messages
147
- + i18n: git-branch "Deleted branch [...]" message
148
- + i18n: git-branch "remote branch '%s' not found" message
149
- + i18n: git-branch basic messages
150
- + i18n: git-add "Unstaged changes" message
151
- + i18n: git-add "remove '%s'" message
152
- + i18n: git-add "did not match any files" message
153
- + i18n: git-add "The following paths are ignored" message
154
- + i18n: git-add basic messages
155
- + i18n: git-clone "Cloning into" message
156
- + i18n: git-clone "Cloning into" message
157
- + i18n: git-clone basic messages
158
- + i18n: git-init "Initialized [...] repository" message
159
- + i18n: git-init basic messages
160
-
161
-* jc/merge-sans-branch (2011-03-23) 2 commits
162
- (merged to 'next' on 2011-03-31 at 754a6af)
163
- + merge: merge with the default upstream branch without argument
164
- + merge: match the help text with the documentation
165
-
166
-* jk/pull-into-empty (2011-03-25) 2 commits
167
- (merged to 'next' on 2011-03-31 at d4dd598)
168
- + pull: do not clobber untracked files on initial pull
169
- + merge: merge unborn index before setting ref
170
-
171
-* jr/grep-en-config (2011-03-30) 1 commit
172
- (merged to 'next' on 2011-03-31 at 2a73028)
173
- + grep: allow -E and -n to be turned on by default via configuration
174
-
175
-* nd/init-gitdir (2011-03-19) 2 commits
176
- (merged to 'next' on 2011-03-31 at 3b8fb40)
177
- + init, clone: support --separate-git-dir for .git file
178
- + git-init.txt: move description section up
179
-
180
-* sb/sparse-more (2011-03-21) 1 commit
181
- (merged to 'next' on 2011-03-23 at 4bec1d1)
182
- + Makefile: Cover more files with make check
79
+* jh/gitweb-localtime (2011-03-23) 1 commit
80
+ - gitweb: javascript ability to adjust time based on timezone
81
184
---------------------------------------------------
185
-[Stalled]
82
+* mg/show-without-prune (2011-04-01) 1 commit
83
+ - builtin/show: do not prune by pathspec
84
+ (this branch uses mg/reflog-with-options.)
85
+
86
+I wanted to like this, but it still feels like too much magic.
87
88
* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
89
- Look for password in both CVS and CVSNT password files.
@@ -214,6 +115,46 @@ current usage context.
115
--------------------------------------------------
116
[Cooking]
117
118
+* dm/color-palette (2011-04-05) 1 commit
119
+ (merged to 'next' on 2011-04-04 at 0244ef9)
120
+ + Share color list between graph and show-branch
121
+
122
+* mg/sha1-path-advise (2011-03-31) 2 commits
123
+ (merged to 'next' on 2011-04-04 at e429e0c)
124
+ + sha1_name: Suggest commit:./file for path in subdir
125
+ + t1506: factor out test for "Did you mean..."
126
+
127
+* ar/clean-rmdir-empty (2011-04-01) 1 commit
128
+ (merged to 'next' on 2011-04-03 at c63fac8)
129
+ + clean: unreadable directory may still be rmdir-able if it is empty
130
+
131
+* jk/maint-push-async-hang (2011-03-31) 4 commits
132
+ - send-pack: abort sideband demuxer on pack-objects error
133
+ - run-command: allow aborting async code prematurely
134
+ - finish_async: be quiet when waiting for async process
135
+ - teach wait_or_whine a "quiet" mode
136
+ (this branch is used by jk/maint-push-async-hang-threads.)
137
+
138
+* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
139
+ - run-command: implement abort_async for pthreads
140
+ - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
141
+ (this branch uses jk/maint-push-async-hang.)
142
+
143
+* mg/reflog-with-options (2011-04-01) 3 commits
144
+ (merged to 'next' on 2011-04-03 at e69a95c)
145
+ + reflog: fix overriding of command line options
146
+ + t/t1411: test reflog with formats
147
+ + builtin/log.c: separate default and setup of cmd_log_init()
148
+ (this branch is used by mg/show-without-prune.)
149
+
150
+Reasonable, but can wait.
151
+
152
+* mh/git-svn-automkdirs (2011-04-01) 1 commit
153
+ (merged to 'next' on 2011-04-03 at 7fa4978)
154
+ + git-svn: add an option to skip the creation of empty directories
155
+
156
+Should be safe, but I'd like an Ack from git-svn folks.
157
+
158
* jc/diff-irreversible-delete (2011-02-28) 1 commit
159
(merged to 'next' on 2011-04-03 at 5a23b23)
160
+ git diff -D: omit the preimage of deletes
@@ -223,15 +164,6 @@ Unstuck, thanks to Michael J Gruber.
164
* jh/notes-add-ui (2011-03-30) 1 commit
165
- Make "git notes add" more user-friendly when there are existing notes
166
226
-* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
227
- (merged to 'next' on 2011-04-03 at ccc9c1a)
228
- + remote: deprecate --mirror
229
- + remote: separate the concept of push and fetch mirrors
230
- + remote: disallow some nonsensical option combinations
231
-
232
-May want to merge by 1.7.5 as this avoids a nonsense configuration to be
233
-created to confuse unsuspecting users.
234
-
167
* jk/notes-ui-updates (2011-03-30) 7 commits
168
- log/pretty-options: Document --[no-]notes and deprecate old notes options
169
- revision.c: make --no-notes reset --notes list
@@ -293,11 +225,8 @@ merge before 1.7.5.
225
226
I wanted to wait for an independent Ack or two for the tip one, which was
227
a response to regression concerns raised by J6t, but ended up merging it
296
-after giving another look. Will not merge before 1.7.5, as there is no
297
-user visible improvements up to this point.
298
-
299
-* jh/gitweb-localtime (2011-03-23) 1 commit
300
- - gitweb: javascript ability to adjust time based on timezone
228
+to 'next' after giving another look. Will not merge before 1.7.5, as
229
+there is no user visible improvements up to this point.
230
231
* jk/maint-merge-rename-create (2011-03-25) 3 commits
232
(merged to 'next' on 2011-03-31 at b9bc9f1)
@@ -305,15 +234,14 @@ user visible improvements up to this point.
234
+ merge: handle renames with replacement content
235
+ t3030: fix accidental success in symlink rename
236
308
-May merge before rc1, but it is Ok to wait.
309
-
237
* mz/maint-rename-unmerged (2011-03-23) 1 commit
238
(merged to 'next' on 2011-03-31 at c7b3d9a)
239
+ diffcore-rename: don't consider unmerged path as source
240
241
Will cook until 1.7.5 final.
242
316
-* nd/struct-pathspec (2011-03-25) 4 commits
243
+* nd/struct-pathspec (2011-04-05) 5 commits
244
+ - pathspec: rename per-item field has_wildcard to use_wildcard
245
(merged to 'next' on 2011-03-31 at 66cbb7d)
246
+ Improve tree_entry_interesting() handling code
247
+ Convert read_tree{,_recursive} to support struct pathspec
@@ -328,12 +256,8 @@ Will cook until 1.7.5 final.
256
(merged to 'next' on 2011-03-31 at 962e058)
257
+ add: make "add -u/-A" update full tree without pathspec
258
331
-The bottom one is a necessary first step toward the UI clean-up planned
332
-for 1.8.0 which we discussed in length in the earlier part of the cycle;
333
-the change is low impact, isolated, and has no risk of breaking the system
334
-as a whole, but I would wait until the ":/" magic pathspec materializes,
335
-as the advice message would have to become different, and the way to get
336
-more stable semantics will become more direct.
259
+Need to redo the advice after the "this is from root of the working tree"
260
+magic pathspec.
261
262
* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
263
(merged to 'next' on 2011-03-31 at 8d685d7)
@@ -347,6 +271,8 @@ Will hold.
271
* cn/system-path-tweak (2011-03-17) 1 commit
272
- system_path: use a static buffer
273
274
+Don't see much point in this itself. Probably will drop.
275
+
276
* en/merge-recursive (2011-03-17) 4 commits
277
(merged to 'next' on 2011-03-18 at a32016b)
278
+ merge-recursive: tweak magic band-aid
@@ -356,35 +282,3 @@ Will hold.
282
+ t6022: New test checking for unnecessary updates of renamed+modified files
283
284
I am not happy with these magic band aids. Will hold.
359
-
360
-* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
361
- (merged to 'next' on 2011-03-20 at a5e452d)
362
- + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
363
- + submodule update: Don't fetch when the submodule commit is already present
364
- + fetch/pull: Don't recurse into a submodule when commits are already present
365
- + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
366
- + config: teach the fetch.recurseSubmodules option the 'on-demand' value
367
- + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
368
- + fetch/pull: recurse into submodules when necessary
369
-
370
-Will merge.
371
-
372
---------------------------------------------------
373
-[Discarded]
374
-
375
-* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
376
- . [wip] commit: allow editing notes in commit message editor
377
- . notes: make expand_notes_ref globally accessible
378
-
379
-* jk/progress-with-pager (2011-03-24) 4 commits
380
- . diff: turn on rename detection progress reporting
381
- . show: turn on rename detection progress reporting
382
- . progress: use pager's original_stderr if available
383
- . pager: save the original stderr when redirecting to pager
384
-
385
-* mg/grep-full-tree (2011-03-01) 2 commits
386
- . grep: make --full-tree work with pathspecs
387
- . grep: --full-tree
388
-
389
-It would be preferable to use ":/" or whatever magic pathspec that is
390
-relative to the root of the working tree.