What's cooking (2011/03 #03)
Junio C Hamano committed
Mar 22, 2011 at 22:49 UTC
dace785dd17dad34395f27bdc9614805ad24e7fa
1 file changed
+151
-225
whats-cooking.txt
+151
-225
@@ -1,163 +1,33 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2011, #02; Sun, 20)
3
-X-master-at: a91df69cbb5ced7837525106ff57ff349180770b
4
-X-next-at: a171c98383be633c617ac36a0665e26416ac90bd
2
+Subject: What's cooking in git.git (Mar 2011, #03; Tue, 22)
3
+X-master-at: 5e839c8f6d5edfaf0d2250f3c9628a238e24c6be
4
+X-next-at: 18336960f038eb2d7d5eb883b2967c8e38bedc3e
5
6
-What's cooking in git.git (Mar 2011, #02; Sun, 20)
6
+What's cooking in git.git (Mar 2011, #03; Tue, 22)
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
-The very basic of i18n is now in 'master'. I'll be moving the rest of the
13
-series forward shortly.
12
+I notice that there are too many stalled topics, for which only the
13
+"finishing touches" are the missing pieces. These new "features" and
14
+"usability" that were discussed, tried, and then abandoned are things that
15
+we survived without so far, so in that sense I do not see very strong need
16
+for me to step in and clean them up alone, shaving my beauty sleep time.
17
15
---------------------------------------------------
16
-[Graduated to "master"]
17
-
18
-* ab/i18n-basic (2011-02-25) 9 commits
19
- (merged to 'next' on 2011-03-10 at ab70d57)
20
- + i18n: "make distclean" should clean up after "make pot"
21
- + i18n: Makefile: "pot" target to extract messages marked for translation
22
- + i18n: add stub Q_() wrapper for ngettext
23
- + i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
24
- + i18n: add GETTEXT_POISON to simulate unfriendly translator
25
- + i18n: add no-op _() and N_() wrappers
26
- + commit, status: use status_printf{,_ln,_more} helpers
27
- + commit: refer to commit template as s->fp
28
- + wt-status: add helpers for printing wt-status lines
29
- (this branch is used by ab/i18n-st.)
30
-
31
-* fk/maint-cvsimport-early-failure (2011-01-31) 1 commit
32
- (merged to 'next' on 2011-03-09 at b4dee9e)
33
- + git-cvsimport.perl: Bail out right away when reading from the server fails
34
-
35
-* jc/checkout-orphan-warning (2011-02-18) 1 commit
36
- (merged to 'next' on 2011-03-09 at 765cf75)
37
- + commit: give final warning when reattaching HEAD to leave commits behind
38
-
39
-* jc/maint-apply-no-double-patch (2011-03-04) 1 commit
40
- (merged to 'next' on 2011-03-09 at 6ec48e7)
41
- + apply: do not patch lines that were already patched
42
-
43
-* jc/maint-apply-report-offset (2011-03-04) 1 commit
44
- (merged to 'next' on 2011-03-09 at 1bb74ef)
45
- + apply -v: show offset count when patch did not apply exactly
46
-
47
-* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit
48
- (merged to 'next' on 2011-03-09 at 13a9328)
49
- + branch/checkout --track: Ensure that upstream branch is indeed a branch
50
-
51
-* jk/format-patch-multiline-header (2011-02-23) 3 commits
52
- (merged to 'next' on 2011-03-09 at f970fe3)
53
- + format-patch: rfc2047-encode newlines in headers
54
- + format-patch: wrap long header lines
55
- + strbuf: add fixed-length version of add_wrapped_text
56
-
57
-* jk/merge-rename-ux (2011-02-20) 6 commits
58
- (merged to 'next' on 2011-03-09 at df1943a)
59
- + pull: propagate --progress to merge
60
- + merge: enable progress reporting for rename detection
61
- + add inexact rename detection progress infrastructure
62
- + commit: stop setting rename limit
63
- + bump rename limit defaults (again)
64
- + merge: improve inexact rename limit warning
65
-
66
-* jk/strbuf-vaddf (2011-03-08) 3 commits
67
- (merged to 'next' on 2011-03-09 at 9651bc5)
68
- + compat: fall back on __va_copy if available
69
- + strbuf: add strbuf_vaddf
70
- + compat: provide a fallback va_copy definition
71
- (this branch is used by ab/i18n-basic, ab/i18n-st, jk/trace-sifter and jn/status-translatable.)
72
-
73
-* jk/trace-sifter (2011-02-24) 6 commits
74
- (merged to 'next' on 2011-03-09 at 07841db)
75
- + trace: give repo_setup trace its own key
76
- + add packet tracing debug code
77
- + trace: add trace_strbuf
78
- + trace: factor out "do we want to trace" logic
79
- + trace: refactor to support multiple env variables
80
- + trace: add trace_vprintf
81
-
82
-* jn/maint-instaweb-plack-fix (2011-02-26) 1 commit
83
- (merged to 'next' on 2011-03-09 at 3c9e14b)
84
- + git-instaweb: Change how gitweb.psgi is made runnable as standalone app
85
-
86
-* jn/status-translatable (2011-02-25) 3 commits
87
- (merged to 'next' on 2011-03-09 at d00d23d)
88
- + commit, status: use status_printf{,_ln,_more} helpers
89
- + commit: refer to commit template as s->fp
90
- + wt-status: add helpers for printing wt-status lines
91
-
92
-* js/rerere-forget-always-take-pathspec (2011-03-01) 1 commit
93
- (merged to 'next' on 2011-03-10 at 2d1ded3)
94
- + rerere forget: deprecate invocation without pathspec
95
-
96
-* mg/rev-list-n-reverse-doc (2011-03-08) 2 commits
97
- (merged to 'next' on 2011-03-10 at 62d3161)
98
- + git-log.txt,rev-list-options.txt: put option blocks in proper order
99
- + git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
100
-
101
-* mm/maint-log-n-with-diff-filtering (2011-03-09) 1 commit
102
- (merged to 'next' on 2011-03-10 at 33af1cd)
103
- + log: fix --max-count when used together with -S or -G
104
-
105
-* mm/push-default-advice (2011-03-02) 2 commits
106
- (merged to 'next' on 2011-03-09 at 160095b)
107
- + push: better error message when no remote configured
108
- + push: better error messages when push.default = tracking
109
-
110
-* mr/hpux (2011-03-07) 2 commits
111
- (merged to 'next' on 2011-03-09 at 8a5fe11)
112
- + git-compat-util.h: Honor HP C's noreturn attribute
113
- + Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
114
-
115
-* sp/maint-fd-limit (2011-03-02) 3 commits
116
- (merged to 'next' on 2011-03-09 at 389e97d)
117
- + sha1_file.c: Don't retain open fds on small packs
118
- + mingw: add minimum getrlimit() compatibility stub
119
- + Limit file descriptors used by packs
120
-
121
-* ss/mergetool--lib (2011-02-27) 2 commits
122
- (merged to 'next' on 2011-03-09 at 004fb9c)
123
- + mergetool--lib: Add Beyond Compare 3 as a tool
124
- + mergetool--lib: Sort tools alphabetically for easier lookup
125
-
126
-* uk/ls-remote-in-get-remote-url (2011-03-01) 2 commits
127
- (merged to 'next' on 2011-03-09 at 09b570b)
128
- + git-request-pull: open-code the only invocation of get_remote_url
129
- + get_remote_url(): use the same data source as ls-remote to get remote urls
18
+But it is a shame to see all the discussions and efforts go to waste when
19
+we are this (shows the thumb and the index finger almost touching)
20
+close. Discussing new features may be more fun, but please, people, let's
21
+start wrapping things up for this cycle.
22
23
--------------------------------------------------
132
-[New Topics]
24
+[Graduated to "master"]
25
26
* jc/maint-fetch-alt (2011-03-11) 2 commits
27
(merged to 'next' on 2011-03-17 at c61ec4f)
28
+ fetch-pack: objects in our alternates are available to us
29
+ refs_from_alternate: helper to use refs from alternates
30
139
-* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
140
- - rerere: make sure it works even in a workdir attached to a young repository
141
-
142
-Do not merge; needs more thought around relative symlinks.
143
-
144
-* lt/default-abbrev (2010-10-28) 1 commit
145
- (merged to 'next' on 2011-03-17 at 1d7e406)
146
- + Make the default abbrev length configurable
147
-
148
-The configuration roughly corresponds to --abbrev command line option, so
149
-I should rename it back to core.abbrev as Linus originally named it.
150
-
151
-* pk/stash-apply-status-relative (2011-03-12) 1 commit
152
- - git stash: show status relative to current directory
153
-
154
-Will merge to 'next'.
155
-
156
-* sg/complete-symmetric-diff (2011-03-10) 2 commits
157
- (merged to 'next' on 2011-03-17 at adb0618)
158
- + bash: complete 'git diff ...branc<TAB>'
159
- + bash: fix misindented esac statement in __git_complete_file()
160
-
31
* jc/maint-rev-list-culled-boundary (2011-03-14) 1 commit
32
(merged to 'next' on 2011-03-17 at 001b546)
33
+ list-objects.c: don't add an unparsed NULL as a pending tree
@@ -175,6 +45,30 @@ Will merge to 'next'.
45
+ stash: copy the index using --index-output instead of cp -p
46
+ stash: fix incorrect quoting in cleanup of temporary files
47
48
+* mg/doc-bisect-tweak-worktree (2011-03-15) 2 commits
49
+ (merged to 'next' on 2011-03-17 at e0acf52)
50
+ + git-bisect.txt: example for bisecting with hot-fix
51
+ + git-bisect.txt: streamline run presentation
52
+
53
+* mg/rev-list-one-side-only (2011-03-10) 10 commits
54
+ (merged to 'next' on 2011-03-10 at 2a69869)
55
+ + git-log: put space after commit mark
56
+ + t6007: test rev-list --cherry
57
+ + log --cherry: a synonym
58
+ + rev-list: documentation and test for --cherry-mark
59
+ + revision.c: introduce --cherry-mark
60
+ + rev-list/log: factor out revision mark generation
61
+ + rev-list: --left/right-only are mutually exclusive
62
+ + rev-list: documentation and test for --left/right-only
63
+ + t6007: Make sure we test --cherry-pick
64
+ + revlist.c: introduce --left/right-only for unsymmetric picking
65
+ (this branch is used by mg/rev-list-n-parents.)
66
+
67
+* sg/complete-symmetric-diff (2011-03-10) 2 commits
68
+ (merged to 'next' on 2011-03-17 at adb0618)
69
+ + bash: complete 'git diff ...branc<TAB>'
70
+ + bash: fix misindented esac statement in __git_complete_file()
71
+
72
* sp/maint-fetch-pack-stop-early (2011-03-14) 2 commits
73
(merged to 'next' on 2011-03-17 at 2580068)
74
+ fetch-pack: Implement no-done capability
@@ -186,54 +80,49 @@ Will merge to 'next'.
80
+ upload-pack: Implement no-done capability
81
+ upload-pack: More aggressively send 'ACK %s ready'
82
189
-* mg/doc-bisect-tweak-worktree (2011-03-15) 2 commits
190
- (merged to 'next' on 2011-03-17 at e0acf52)
191
- + git-bisect.txt: example for bisecting with hot-fix
192
- + git-bisect.txt: streamline run presentation
193
-
83
* tl/p4 (2011-03-15) 3 commits
84
(merged to 'next' on 2011-03-17 at 3d7f69f)
85
+ git-p4: Fix error message crash in P4Sync.commit.
86
+ Teach git-p4 to ignore case in perforce filenames if configured.
87
+ git-p4: Teach gitConfig method about arguments.
88
200
-* cn/system-path-tweak (2011-03-17) 1 commit
201
- - system_path: use a static buffer
89
+--------------------------------------------------
90
+[New Topics]
91
203
-* jc/fetch-progressive-stride (2011-03-18) 3 commits
204
- - fetch-pack: use smaller handshake window for initial request
205
- - fetch-pack: progressively use larger handshake windows
206
- - fetch-pack: factor out hardcoded handshake window size
207
- (this branch uses sp/maint-fetch-pack-stop-early.)
92
+* jc/add-u-migration (2011-03-22) 3 commits
93
+ - add: make "add -u/-A" update full tree without pathspec (step 3)
94
+ - add: make "add -u/-A" update full tree without pathspec (step 2)
95
+ - add: make "add -u/-A" update full tree without pathspec
96
209
-The top two need to be cleaned up with correct author name.
97
+The earlier one was a flawed migration path. We would probably need
98
+per-user preference after all.
99
211
-* jc/maint-diff-q-filter (2011-03-16) 1 commit
212
- - diff --quiet: disable optimization when --diff-filter=X is used
100
+* jk/checkout-orphan-warning (2011-03-20) 3 commits
101
+ - checkout: tweak detached-orphan warning format
102
+ - checkout: clear commit marks after detached-orphan check
103
+ - checkout: add basic tests for detached-orphan warning
104
105
Will merge to 'next'.
106
216
-* jn/fortify-source-workaround (2011-03-16) 1 commit
217
- - run-command: prettify -D_FORTIFY_SOURCE workaround
107
+* mg/rev-list-n-parents (2011-03-21) 3 commits
108
+ - rev-list --min-parents,--max-parents: doc, test and completion
109
+ - revision.c: introduce --min-parents and --max-parents options
110
+ - t6009: use test_commit() from test-lib.sh
111
219
-Will merge to 'next'.
112
+Perhaps will wait until the "infinity" syntax settles.
113
221
-* jn/maint-c99-format (2011-03-16) 2 commits
222
- - unbreak and eliminate NO_C99_FORMAT
223
- - mktag: avoid %td in format string
114
+* jc/index-update-if-able (2011-03-21) 2 commits
115
+ - update $GIT_INDEX_FILE when there are racily clean entries
116
+ - diff/status: refactor opportunistic index update
117
225
-Will merge to 'next'.
118
+* jp/completion-help-alias (2011-03-21) 1 commit
119
+ - git-completion: Add git help completion for aliases
120
227
-* kc/gitweb-pathinfo-w-anchor (2011-03-18) 1 commit
228
- - gitweb: fix #patchNN anchors when path_info is enabled
121
+* js/remove-unused-variables (2011-03-22) 1 commit
122
+ - Remove unused variables
123
230
-Will merge to 'next'.
231
-
232
-* pw/p4 (2011-03-16) 2 commits
233
- - git-p4: test sync new branch
234
- - git-p4: fix sync new branch regression
235
-
236
-Will merge to 'next'.
124
+* sb/sparse-more (2011-03-21) 1 commit
125
+ - Makefile: Cover more files with make check
126
127
--------------------------------------------------
128
[Stalled]
@@ -295,6 +184,12 @@ Ok to me.
184
"diff -B -D" should omit the deleting half of a broken pair from the
185
output. Need documentation and tests.
186
187
+* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
188
+ - Look for password in both CVS and CVSNT password files.
189
+
190
+It seems that we need separate parsers for these two formats in order not
191
+to regress the users of the original cvs.
192
+
193
* jc/index-pack (2011-02-25) 5 commits
194
- index-pack --verify: read anomalous offsets from v2 idx file
195
- write_idx_file: need_large_offset() helper function
@@ -302,14 +197,8 @@ output. Need documentation and tests.
197
- write_idx_file: introduce a struct to hold idx customization options
198
- index-pack: group the delta-base array entries also by type
199
305
-Still a WIP. Need to put histogram output into index-pack --verify to
306
-really kill verify-pack.
307
-
308
-* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
309
- - Look for password in both CVS and CVSNT password files.
310
-
311
-It seems that we need separate parsers for these two formats in order not
312
-to regress the users of the original cvs.
200
+Still a WIP, and will not be ready for 1.7.5. Need to put histogram output
201
+into index-pack --verify to really kill verify-pack.
202
203
* jk/tag-contains (2010-07-05) 4 commits
204
- Why is "git tag --contains" so slow?
@@ -326,13 +215,6 @@ current usage context.
215
- [wip] commit: allow editing notes in commit message editor
216
- notes: make expand_notes_ref globally accessible
217
329
-* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
330
- . diffcore-rename: fall back to -C when -C -C busts the rename limit
331
- . diffcore-rename: record filepair for rename src
332
- . diffcore-rename: refactor "too many candidates" logic
333
-
334
-Will take another look.
335
-
218
* mg/grep-full-tree (2011-03-01) 2 commits
219
- grep: make --full-tree work with pathspecs
220
- grep: --full-tree
@@ -340,24 +222,73 @@ Will take another look.
222
Do not merge; it would be preferable to use ":/" or whatever magic
223
pathspec that is relative to the root of the working tree.
224
343
-* nd/rfc-add-u-full-tree (2011-02-07) 1 commit
344
- - add: make "add -u" update full tree without pathspec
225
+* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
226
+ - rerere: make sure it works even in a workdir attached to a young repository
227
346
-A three-phase migration that:
228
+Do not merge; needs more thought around relative symlinks.
229
348
- (1) first only warns when we would deviate from traditional behaviour and
349
- suggest adding "." if the user wants to limit it to cwd, but doesn't
350
- actually add full-tree, in the next release;
230
+--------------------------------------------------
231
+[Cooking]
232
352
- (2) warn that we have changed the behaviour and suggest adding "." if the
353
- user wants to limit it to cwd, and actually do full-tree, in 1.8.0;
233
+* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
234
+ - diffcore-rename: fall back to -C when -C -C busts the rename limit
235
+ - diffcore-rename: record filepair for rename src
236
+ - diffcore-rename: refactor "too many candidates" logic
237
+ - builtin/diff.c: remove duplicated call to diff_result_code()
238
+
239
+Took another look and even wrote tests, but it turns out that it needed
240
+rebasing on bf0ab10 (merge: improve inexact rename limit warning,
241
+2011-02-19), as that commit didn't anticipate that we may want this
242
+warning outside merge-recursive codepath. The top one ended up
243
+larger than it should have been as a result.
244
+
245
+* lt/default-abbrev (2011-03-20) 2 commits
246
+ (merged to 'next' on 2011-03-20 at 17ed457)
247
+ + Rename core.abbrevlength back to core.abbrev
248
+ (merged to 'next' on 2011-03-17 at 1d7e406)
249
+ + Make the default abbrev length configurable
250
355
- (3) remove the warning, in 1.8.X (for X at least 2 or more).
251
+The configuration roughly corresponds to --abbrev command line option, so
252
+I should rename it back to core.abbrev as Linus originally named it.
253
+Will merge to 'master'.
254
357
-would be a good way forward.
255
+* pk/stash-apply-status-relative (2011-03-14) 2 commits
256
+ (merged to 'next' on 2011-03-20 at 232b096)
257
+ + Add test: git stash shows status relative to current dir
258
+ + git stash: show status relative to current directory
259
359
---------------------------------------------------
360
-[Cooking]
260
+Will merge to 'master'.
261
+
262
+* cn/system-path-tweak (2011-03-17) 1 commit
263
+ - system_path: use a static buffer
264
+
265
+* jc/fetch-progressive-stride (2011-03-20) 3 commits
266
+ (merged to 'next' on 2011-03-20 at 2917b19)
267
+ + fetch-pack: use smaller handshake window for initial request
268
+ + fetch-pack: progressively use larger handshake windows
269
+ + fetch-pack: factor out hardcoded handshake window size
270
+
271
+* jc/maint-diff-q-filter (2011-03-16) 1 commit
272
+ (merged to 'next' on 2011-03-20 at d3d85dc)
273
+ + diff --quiet: disable optimization when --diff-filter=X is used
274
+
275
+* jn/fortify-source-workaround (2011-03-16) 1 commit
276
+ (merged to 'next' on 2011-03-20 at 69c4ceb)
277
+ + run-command: prettify -D_FORTIFY_SOURCE workaround
278
+
279
+* jn/maint-c99-format (2011-03-16) 2 commits
280
+ (merged to 'next' on 2011-03-20 at 65cbc8c)
281
+ + unbreak and eliminate NO_C99_FORMAT
282
+ + mktag: avoid %td in format string
283
+
284
+* kc/gitweb-pathinfo-w-anchor (2011-03-18) 1 commit
285
+ (merged to 'next' on 2011-03-20 at 2d65786)
286
+ + gitweb: fix #patchNN anchors when path_info is enabled
287
+
288
+* pw/p4 (2011-03-16) 2 commits
289
+ (merged to 'next' on 2011-03-20 at fdad818)
290
+ + git-p4: test sync new branch
291
+ + git-p4: fix sync new branch regression
292
293
* en/merge-recursive (2011-03-17) 4 commits
294
(merged to 'next' on 2011-03-18 at a32016b)
@@ -374,15 +305,14 @@ I am not happy with these magic band aids.
305
- git-init.txt: move description section up
306
307
* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
377
- - fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
378
- - submodule update: Don't fetch when the submodule commit is already present
379
- - fetch/pull: Don't recurse into a submodule when commits are already present
380
- - Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
381
- - config: teach the fetch.recurseSubmodules option the 'on-demand' value
382
- - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
383
- - fetch/pull: recurse into submodules when necessary
384
-
385
-Is this ready to move forward?
308
+ (merged to 'next' on 2011-03-20 at a5e452d)
309
+ + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
310
+ + submodule update: Don't fetch when the submodule commit is already present
311
+ + fetch/pull: Don't recurse into a submodule when commits are already present
312
+ + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
313
+ + config: teach the fetch.recurseSubmodules option the 'on-demand' value
314
+ + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
315
+ + fetch/pull: recurse into submodules when necessary
316
317
* ss/git-gui-mergetool (2011-02-26) 2 commits
318
(merged to 'next' on 2011-03-17 at a8fac18)
@@ -390,11 +320,13 @@ Is this ready to move forward?
320
+ mergetool--lib: Sort tools alphabetically for easier lookup
321
322
The CLI side (ss/mergetool--lib topic) will be in the next release, so
393
-I'll ping Pat to take this into gut-gui tree.
323
+I've pinged Pat to take this into gut-gui tree.
324
325
* nd/index-doc (2010-09-06) 1 commit
326
- doc: technical details about the index file format
327
328
+Will merge to 'next'.
329
+
330
* ab/i18n-st (2011-02-22) 69 commits
331
- i18n: git-shortlog basic messages
332
- i18n: git-revert split up "could not revert/apply" message
@@ -466,18 +398,12 @@ I'll ping Pat to take this into gut-gui tree.
398
- i18n: git-init "Initialized [...] repository" message
399
- i18n: git-init basic messages
400
469
-* mg/rev-list-one-side-only (2011-03-10) 10 commits
470
- (merged to 'next' on 2011-03-10 at 2a69869)
471
- + git-log: put space after commit mark
472
- + t6007: test rev-list --cherry
473
- + log --cherry: a synonym
474
- + rev-list: documentation and test for --cherry-mark
475
- + revision.c: introduce --cherry-mark
476
- + rev-list/log: factor out revision mark generation
477
- + rev-list: --left/right-only are mutually exclusive
478
- + rev-list: documentation and test for --left/right-only
479
- + t6007: Make sure we test --cherry-pick
480
- + revlist.c: introduce --left/right-only for unsymmetric picking
401
+--------------------------------------------------
402
+[Discarded]
403
+
404
+* nd/rfc-add-u-full-tree (2011-02-07) 1 commit
405
+ - add: make "add -u" update full tree without pathspec
406
+
407
+See jc/add-u-migration.
408
482
-Looked sensible, including the change of the output.
409