What's cooking (2011/03 #06)
Junio C Hamano committed
Mar 31, 2011 at 14:48 UTC
909370840521b852fa6f3f5104d18eeedd822143
1 file changed
+162
-131
whats-cooking.txt
+162
-131
@@ -1,106 +1,126 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2011, #05; Sun, 27)
3
-X-master-at: be919d50c08fbe3a0653d6ba778b73f4940705ca
4
-X-next-at: be8b495e51e5bd78849a4c79633fcb93d3959a48
2
+Subject: What's cooking in git.git (Mar 2011, #06; Thu, 31)
3
+X-master-at: 6acef043581d69597860f3343ec2691c72b0803c
4
+X-next-at: ae5b80d74263fcfbdcca7004dee1552cb35a2a9d
5
6
-What's cooking in git.git (Mar 2011, #05; Sun, 27)
6
+What's cooking in git.git (Mar 2011, #06; Thu, 31)
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
---------------------------------------------------
13
-[New Topics]
12
+It's been two months since v1.7.4 and -rc0 was way overdue. I'll do a -rc1
13
+sometime next week, hoping that we can finish this cycle by mid April.
14
15
-* jc/merge-sans-branch (2011-03-23) 2 commits
16
- - merge: merge with the default upstream branch without argument
17
- - merge: match the help text with the documentation
15
+Which means that from now on, we wouldn't be interested in topics that are
16
+mostly internal clean-ups, new features that is not already in 'master',
17
+nor fixes for nontrivial bugs that are not regressions. A bug that
18
+existed since v1.7.0 is something we have lived with long enough that it
19
+is not worth the risk of introducing other new bugs by trying to fix it
20
+before 1.7.5 final).
21
19
-Allow running "git merge" without telling it what to merge. It will merge
20
-with the "upstream" of the current branch if configured.
22
+What we would want to see are regression fixes. There are quite a few new
23
+topics that have already graduated in 'master', or have been cooking and
24
+should be in 'master' shortly. If they introduce new bugs that didn't
25
+exist in v1.7.4, they need to be squashed before anything else.
26
22
-* jh/gitweb-localtime (2011-03-23) 1 commit
23
- - gitweb: javascript ability to adjust time based on timezone
27
+The criteria is a bit looser for documentation updates. Simple grammar
28
+and spelling fixes are usually safe; changes in the structure and markups
29
+are riskier.
30
25
-* jk/maint-merge-rename-create (2011-03-25) 3 commits
26
- - merge: turn on rewrite detection
27
- - merge: handle renames with replacement content
28
- - t3030: fix accidental success in symlink rename
31
+In any case, please use your best judgement and help polishing v1.7.5
32
+release.
33
30
-* jk/pull-into-empty (2011-03-25) 2 commits
31
- - pull: do not clobber untracked files on initial pull
32
- - merge: merge unborn index before setting ref
34
+--------------------------------------------------
35
+[New Topics]
36
34
-* mz/maint-rename-unmerged (2011-03-23) 1 commit
35
- - diffcore-rename: don't consider unmerged path as source
37
+* jh/notes-add-ui (2011-03-30) 1 commit
38
+ - Make "git notes add" more user-friendly when there are existing notes
39
+
40
+* jk/maint-remote-mirror-safer (2011-03-30) 3 commits
41
+ - remote: deprecate --mirror
42
+ - remote: separate the concept of push and fetch mirrors
43
+ - remote: disallow some nonsensical option combinations
44
+
45
+* jk/notes-ui-updates (2011-03-30) 7 commits
46
+ - log/pretty-options: Document --[no-]notes and deprecate old notes options
47
+ - revision.c: make --no-notes reset --notes list
48
+ - revision.c: support --notes command-line option
49
+ - notes: refactor display notes default handling
50
+ - notes: refactor display notes extra refs field
51
+ - revision.c: refactor notes ref expansion
52
+ - notes: make expand_notes_ref globally accessible
53
37
-* nd/struct-pathspec (2011-03-25) 4 commits
38
- - Improve tree_entry_interesting() handling code
39
- - Convert read_tree{,_recursive} to support struct pathspec
40
- - Reimplement read_tree_recursive() using tree_entry_interesting()
41
- - Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
54
+* jr/grep-en-config (2011-03-30) 1 commit
55
+ (merged to 'next' on 2011-03-31 at 2a73028)
56
+ + grep: allow -E and -n to be turned on by default via configuration
57
43
---------------------------------------------------
44
-[Graduated to "master"]
58
+This is low impact, isolated, and has no risk of breaking the system as a
59
+whole. May merge by rc1.
60
+
61
+* nd/maint-setup (2011-03-26) 2 commits
62
+ (merged to 'next' on 2011-03-31 at 2c36f6a)
63
+ + Kill off get_relative_cwd()
64
+ + setup: return correct prefix if worktree is '/'
65
+
66
+This benefits only the minority who use /.git at the root level of the
67
+filesystem, but the changed code is used from many codepaths; will not
68
+merge before 1.7.5.
69
46
-* jc/fetch-progressive-stride (2011-03-20) 3 commits
47
- (merged to 'next' on 2011-03-20 at 2917b19)
48
- + fetch-pack: use smaller handshake window for initial request
49
- + fetch-pack: progressively use larger handshake windows
50
- + fetch-pack: factor out hardcoded handshake window size
70
+--------------------------------------------------
71
+[Stalled]
72
52
-* jc/index-update-if-able (2011-03-21) 2 commits
53
- (merged to 'next' on 2011-03-23 at e7e071a)
54
- + update $GIT_INDEX_FILE when there are racily clean entries
55
- + diff/status: refactor opportunistic index update
73
+* jc/diff-irreversible-delete (2011-02-28) 1 commit
74
+ - git diff -D: omit the preimage of deletes
75
57
-* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
58
- (merged to 'next' on 2011-03-23 at e5ef1a2)
59
- + rerere: make sure it works even in a workdir attached to a young repository
76
+"diff -B -D" should omit the deleting half of a broken pair from the
77
+output. This is low impact, isolated, and has no risk of breaking the
78
+system as a whole, but the topic needs documentation and tests.
79
61
-Resurrected, as this was originally written with the explicit goal of
62
-helping contrib/workdir/git-new-workdir users, and it is good enough to
63
-only support absolute symbolic links for that purpose.
80
+* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
81
+ - Look for password in both CVS and CVSNT password files.
82
65
-* jk/checkout-orphan-warning (2011-03-20) 3 commits
66
- (merged to 'next' on 2011-03-23 at 26adae6)
67
- + checkout: tweak detached-orphan warning format
68
- + checkout: clear commit marks after detached-orphan check
69
- + checkout: add basic tests for detached-orphan warning
83
+It seems that we need separate parsers for these two formats in order not
84
+to regress the users of the original cvs.
85
71
-* jp/completion-help-alias (2011-03-21) 1 commit
72
- (merged to 'next' on 2011-03-23 at e21fa7b)
73
- + git-completion: Add git help completion for aliases
86
+* jc/index-pack (2011-02-25) 5 commits
87
+ - index-pack --verify: read anomalous offsets from v2 idx file
88
+ - write_idx_file: need_large_offset() helper function
89
+ - index-pack: --verify
90
+ - write_idx_file: introduce a struct to hold idx customization options
91
+ - index-pack: group the delta-base array entries also by type
92
75
-* js/remove-unused-variables (2011-03-22) 1 commit
76
- (merged to 'next' on 2011-03-23 at 4630013)
77
- + Remove unused variables
93
+Still a WIP, and will not be ready for 1.7.5. Need to put histogram output
94
+into index-pack --verify to really kill verify-pack.
95
79
-* mg/rev-list-n-parents (2011-03-23) 3 commits
80
- (merged to 'next' on 2011-03-23 at 8baa059)
81
- + rev-list --min-parents,--max-parents: doc, test and completion
82
- + revision.c: introduce --min-parents and --max-parents options
83
- + t6009: use test_commit() from test-lib.sh
96
+* jk/tag-contains (2010-07-05) 4 commits
97
+ - Why is "git tag --contains" so slow?
98
+ - default core.clockskew variable to one day
99
+ - limit "contains" traversals based on commit timestamp
100
+ - tag: speed up --contains calculation
101
85
-Rerolled with --no-max-parents and the like.
102
+The idea of the bottom one is probably Ok, except that the use of object
103
+flags needs to be rethought, or at least the helper needs to be moved to
104
+builtin/tag.c to make it clear that it should not be used outside the
105
+current usage context.
106
87
-* nd/index-doc (2011-03-01) 2 commits
88
- (merged to 'next' on 2011-03-23 at 316cafc)
89
- + doc: technical details about the index file format
90
- + doc: technical details about the index file format
107
+* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
108
+ - [wip] commit: allow editing notes in commit message editor
109
+ - notes: make expand_notes_ref globally accessible
110
92
-* ss/git-gui-mergetool (2011-02-26) 2 commits
93
- (merged to 'next' on 2011-03-17 at a8fac18)
94
- + mergetool--lib: Add Beyond Compare 3 as a tool
95
- + mergetool--lib: Sort tools alphabetically for easier lookup
111
+* mg/grep-full-tree (2011-03-01) 2 commits
112
+ - grep: make --full-tree work with pathspecs
113
+ - grep: --full-tree
114
97
-Merged through Pat's git-gui tree.
115
+Do not merge; it would be preferable to use ":/" or whatever magic
116
+pathspec that is relative to the root of the working tree.
117
118
--------------------------------------------------
100
-[Stalled]
119
+[Cooking]
120
121
* mz/rebase (2011-02-28) 34 commits
103
- - rebase: define options in OPTIONS_SPEC
122
+ (merged to 'next' on 2011-03-31 at 3b1343c)
123
+ + rebase: define options in OPTIONS_SPEC
124
(merged to 'next' on 2011-02-25 at 52caa7a)
125
+ Makefile: do not install sourced rebase scripts
126
(merged to 'next' on 2011-02-22 at 3219155)
@@ -137,63 +157,67 @@ Merged through Pat's git-gui tree.
157
+ rebase: refactor reading of state
158
+ rebase: clearer names for directory variables
159
140
-I think the tip one is a response to J6t's regression concerns; it looked
141
-Ok to me.
160
+I wanted to wait for an independent Ack or two for the tip one, which was
161
+a response to regression concerns raised by J6t, but ended up merging it
162
+after giving another look. Will not merge before 1.7.5, as there is no
163
+user visible improvements up to this point.
164
143
-* jc/diff-irreversible-delete (2011-02-28) 1 commit
144
- - git diff -D: omit the preimage of deletes
145
-
146
-"diff -B -D" should omit the deleting half of a broken pair from the
147
-output. Need documentation and tests.
165
+* jc/merge-sans-branch (2011-03-23) 2 commits
166
+ (merged to 'next' on 2011-03-31 at 754a6af)
167
+ + merge: merge with the default upstream branch without argument
168
+ + merge: match the help text with the documentation
169
149
-* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
150
- - Look for password in both CVS and CVSNT password files.
170
+Allow running "git merge" without telling it what to merge. It will merge
171
+with the "upstream" of the current branch if configured. This is low
172
+impact, isolated, and has no risk of major regression. May merge before
173
+rc1, but it is Ok to wait.
174
152
-It seems that we need separate parsers for these two formats in order not
153
-to regress the users of the original cvs.
175
+* jh/gitweb-localtime (2011-03-23) 1 commit
176
+ - gitweb: javascript ability to adjust time based on timezone
177
155
-* jc/index-pack (2011-02-25) 5 commits
156
- - index-pack --verify: read anomalous offsets from v2 idx file
157
- - write_idx_file: need_large_offset() helper function
158
- - index-pack: --verify
159
- - write_idx_file: introduce a struct to hold idx customization options
160
- - index-pack: group the delta-base array entries also by type
178
+* jk/maint-merge-rename-create (2011-03-25) 3 commits
179
+ (merged to 'next' on 2011-03-31 at b9bc9f1)
180
+ + merge: turn on rewrite detection
181
+ + merge: handle renames with replacement content
182
+ + t3030: fix accidental success in symlink rename
183
162
-Still a WIP, and will not be ready for 1.7.5. Need to put histogram output
163
-into index-pack --verify to really kill verify-pack.
184
+May merge before rc1, but it is Ok to wait.
185
165
-* jk/tag-contains (2010-07-05) 4 commits
166
- - Why is "git tag --contains" so slow?
167
- - default core.clockskew variable to one day
168
- - limit "contains" traversals based on commit timestamp
169
- - tag: speed up --contains calculation
186
+* jk/pull-into-empty (2011-03-25) 2 commits
187
+ (merged to 'next' on 2011-03-31 at d4dd598)
188
+ + pull: do not clobber untracked files on initial pull
189
+ + merge: merge unborn index before setting ref
190
171
-The idea of the bottom one is probably Ok, except that the use of object
172
-flags needs to be rethought, or at least the helper needs to be moved to
173
-builtin/tag.c to make it clear that it should not be used outside the
174
-current usage context.
191
+This is low impact, isolated, and has no risk of major regression. Will
192
+merge before rc1.
193
176
-* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
177
- - [wip] commit: allow editing notes in commit message editor
178
- - notes: make expand_notes_ref globally accessible
194
+* mz/maint-rename-unmerged (2011-03-23) 1 commit
195
+ (merged to 'next' on 2011-03-31 at c7b3d9a)
196
+ + diffcore-rename: don't consider unmerged path as source
197
180
-* mg/grep-full-tree (2011-03-01) 2 commits
181
- - grep: make --full-tree work with pathspecs
182
- - grep: --full-tree
198
+Will cook until 1.7.5 final.
199
184
-Do not merge; it would be preferable to use ":/" or whatever magic
185
-pathspec that is relative to the root of the working tree.
200
+* nd/struct-pathspec (2011-03-25) 4 commits
201
+ (merged to 'next' on 2011-03-31 at 66cbb7d)
202
+ + Improve tree_entry_interesting() handling code
203
+ + Convert read_tree{,_recursive} to support struct pathspec
204
+ + Reimplement read_tree_recursive() using tree_entry_interesting()
205
+ + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
206
187
---------------------------------------------------
188
-[Cooking]
207
+Will cook until 1.7.5 final.
208
209
* jc/add-u-migration (2011-03-22) 3 commits
210
- add: make "add -u/-A" update full tree without pathspec (step 3)
211
- add: make "add -u/-A" update full tree without pathspec (step 2)
193
- - add: make "add -u/-A" update full tree without pathspec
212
+ (merged to 'next' on 2011-03-31 at 962e058)
213
+ + add: make "add -u/-A" update full tree without pathspec
214
195
-The message in the bottom one really needs proofreading to move this topic
196
-forward. Will merge to 'next' the bottom one, hopefully after that.
215
+The bottom one is a necessary first step toward the UI clean-up planned
216
+for 1.8.0 which we discussed in length in the earlier part of the cycle;
217
+the change is low impact, isolated, and has no risk of breaking the system
218
+as a whole, but I would wait until the ":/" magic pathspec materializes,
219
+as the advice message would have to become different, and the way to get
220
+more stable semantics will become more direct.
221
222
* jk/progress-with-pager (2011-03-24) 4 commits
223
- diff: turn on rename detection progress reporting
@@ -201,21 +225,22 @@ forward. Will merge to 'next' the bottom one, hopefully after that.
225
- progress: use pager's original_stderr if available
226
- pager: save the original stderr when redirecting to pager
227
228
+Will cook until 1.7.5 final.
229
+
230
* sb/sparse-more (2011-03-21) 1 commit
231
(merged to 'next' on 2011-03-23 at 4bec1d1)
232
+ Makefile: Cover more files with make check
233
234
+Will merge.
235
+
236
* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
209
- - diffcore-rename: fall back to -C when -C -C busts the rename limit
210
- - diffcore-rename: record filepair for rename src
211
- - diffcore-rename: refactor "too many candidates" logic
212
- - builtin/diff.c: remove duplicated call to diff_result_code()
237
+ (merged to 'next' on 2011-03-31 at 8d685d7)
238
+ + diffcore-rename: fall back to -C when -C -C busts the rename limit
239
+ + diffcore-rename: record filepair for rename src
240
+ + diffcore-rename: refactor "too many candidates" logic
241
+ + builtin/diff.c: remove duplicated call to diff_result_code()
242
214
-Took another look and even wrote tests, but it turns out that it needed
215
-rebasing on bf0ab10 (merge: improve inexact rename limit warning,
216
-2011-02-19), as that commit didn't anticipate that we may want this
217
-warning outside merge-recursive codepath. The top one ended up
218
-larger than it should have been as a result.
243
+Will hold.
244
245
* cn/system-path-tweak (2011-03-17) 1 commit
246
- system_path: use a static buffer
@@ -228,11 +253,14 @@ larger than it should have been as a result.
253
+ t6022: New test checking for unnecessary updates of files in D/F conflicts
254
+ t6022: New test checking for unnecessary updates of renamed+modified files
255
231
-I am not happy with these magic band aids.
256
+I am not happy with these magic band aids. Will hold.
257
258
* nd/init-gitdir (2011-03-19) 2 commits
234
- - init, clone: support --separate-git-dir for .git file
235
- - git-init.txt: move description section up
259
+ (merged to 'next' on 2011-03-31 at 3b8fb40)
260
+ + init, clone: support --separate-git-dir for .git file
261
+ + git-init.txt: move description section up
262
+
263
+Will merge.
264
265
* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
266
(merged to 'next' on 2011-03-20 at a5e452d)
@@ -244,6 +272,8 @@ I am not happy with these magic band aids.
272
+ fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
273
+ fetch/pull: recurse into submodules when necessary
274
275
+Will merge.
276
+
277
* ab/i18n-st (2011-02-22) 69 commits
278
(merged to 'next' on 2011-03-23 at e2732e2)
279
+ i18n: git-shortlog basic messages
@@ -316,7 +346,7 @@ I am not happy with these magic band aids.
346
+ i18n: git-init "Initialized [...] repository" message
347
+ i18n: git-init basic messages
348
319
-Now in 'next'.
349
+Will merge.
350
351
--------------------------------------------------
352
[Discarded]
@@ -325,14 +355,15 @@ Now in 'next'.
355
. warn use of "git diff A..B"
356
. diff: remove dead code that flips arguments order
357
328
-This is 1/4 tongue-in-cheek. Now we seem to have at least two volunteer
329
-cluebat bearers, so I wouldn't have to worry about this topic very much.
358
+This was 1/4 tongue-in-cheek. Now we seem to have a handful of volunteer
359
+cluebat bearers, and I wouldn't have to worry about this topic very much.
360
361
* jh/merge-sans-branch (2011-02-10) 4 commits
362
. merge: add support for merging from upstream by default
333
- - merge: introduce per-branch-configuration helper function
334
- - merge: introduce setup_merge_commit helper function
335
- - merge: update the usage information to be more modern
363
+ . merge: introduce per-branch-configuration helper function
364
+ . merge: introduce setup_merge_commit helper function
365
+ . merge: update the usage information to be more modern
366
367
I've been wanting to move this forward for quite some time but
368
ended up redoing it myself (see jc/merge-sans-branch)
369
+