What's cooking (2011/03 #01)
Junio C Hamano committed
Mar 9, 2011 at 16:58 UTC
ce29fc888ba870948e647dcaf9f5d2657316a7fe
1 file changed
+172
-143
whats-cooking.txt
+172
-143
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2011, #07; Mon, 28)
3
-X-master-at: f70f736bcbb22cfe434eaf20089d9713b991ee31
4
-X-next-at: 0b70480002217322d29f03aafa94d076d6e8c8d5
2
+Subject: What's cooking in git.git (Mar 2011, #01; Wed, 9)
3
+X-master-at: 83c3c6222a2331042c973a991572eafa37f25d1d
4
+X-next-at: 3762932566eb538e640deb32358f68ec4c28ad7f
5
6
-What's cooking in git.git (Feb 2011, #07; Mon, 28)
6
+What's cooking in git.git (Mar 2011, #01; Wed, 9)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,39 +14,89 @@ I started draft release notes for 1.7.5 on 'master' branch.
14
--------------------------------------------------
15
[New Topics]
16
17
-* jc/diff-irreversible-delete (2011-02-28) 1 commit
18
- - git diff -D: omit the preimage of deletes
17
+* en/merge-recursive (2011-02-28) 3 commits
18
+ (merged to 'next' on 2011-03-09 at 3762932)
19
+ + merge-recursive: When we detect we can skip an update, actually skip it
20
+ + t6022: New test checking for unnecessary updates of files in D/F conflicts
21
+ + t6022: New test checking for unnecessary updates of renamed+modified files
22
20
-Just a POC.
23
+* jc/maint-apply-no-double-patch (2011-03-04) 1 commit
24
+ (merged to 'next' on 2011-03-09 at 6ec48e7)
25
+ + apply: do not patch lines that were already patched
26
22
-* jc/index-pack (2011-02-25) 5 commits
23
- - index-pack --verify: read anomalous offsets from v2 idx file
24
- - write_idx_file: need_large_offset() helper function
25
- - index-pack: --verify
26
- - write_idx_file: introduce a struct to hold idx customization options
27
- - index-pack: group the delta-base array entries also by type
27
+* jc/maint-apply-report-offset (2011-03-04) 1 commit
28
+ (merged to 'next' on 2011-03-09 at 1bb74ef)
29
+ + apply -v: show offset count when patch did not apply exactly
30
29
-Still a WIP.
31
+* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
32
+ - [wip] commit: allow editing notes in commit message editor
33
+ - notes: make expand_notes_ref globally accessible
34
31
-* mm/push-default-advice (2011-02-28) 2 commits
32
- - push: better error messages for detached HEAD and "no destination"
33
- - push: better error message when push.default = tracking
35
+* js/rerere-forget-always-take-pathspec (2011-03-01) 1 commit
36
+ - rerere forget: deprecate invocation without pathspec
37
35
-There were some rewording discussion I didn't roll into this, not because
36
-I had objections to, but because I was handling other topics. I expect
37
-I'll see a reroll soonish so that we can merge this down soonish.
38
+* mg/grep-full-tree (2011-03-01) 2 commits
39
+ - grep: make --full-tree work with pathspecs
40
+ - grep: --full-tree
41
39
-* sp/maint-fd-limit (2011-02-28) 2 commits
40
- - mingw: add minimum getrlimit() compatibility stub
41
- - Limit file descriptors used by packs
42
+* mg/rev-list-n-reverse-doc (2011-03-08) 2 commits
43
+ - git-log.txt,rev-list-options.txt: put option blocks in proper order
44
+ - git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
45
43
-Erik, please check the made-up commit log message and sign it off.
44
-Will merge to 'next' after that.
46
+* mm/maint-log-n-with-diff-filtering (2011-03-09) 1 commit
47
+ - log: fix --max-count when used together with -S or -G
48
46
-* uk/ls-remote-in-get-remote-url (2011-02-28) 1 commit
47
- - get_remote_url(): use the same data source as ls-remote to get remote urls
49
+* mr/hpux (2011-03-07) 2 commits
50
+ (merged to 'next' on 2011-03-09 at 8a5fe11)
51
+ + git-compat-util.h: Honor HP C's noreturn attribute
52
+ + Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
53
49
-Will merge to 'next'.
54
+* nd/init-gitdir (2011-03-03) 1 commit
55
+ - init, clone: support --real-git-dir for .git file
56
+
57
+--------------------------------------------------
58
+[Graduated to "master"]
59
+
60
+* jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit
61
+ + grep --no-index: honor pathspecs correctly
62
+
63
+* jk/diffstat-binary (2011-02-19) 2 commits
64
+ + diff: don't retrieve binary blobs for diffstat
65
+ + diff: handle diffstat of rewritten binary files
66
+
67
+* jk/fail-null-clone (2011-02-17) 1 commit
68
+ + clone: die when trying to clone missing local path
69
+
70
+* jn/maint-commit-missing-template (2011-02-25) 1 commit
71
+ + commit: error out for missing commit message template
72
+
73
+* jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit
74
+ + tests: skip terminal output tests on OS X
75
+
76
+* js/checkout-untracked-symlink (2011-02-20) 2 commits
77
+ + do not overwrite untracked symlinks
78
+ + Demonstrate breakage: checkout overwrites untracked symlink with directory
79
+
80
+* js/cherry-pick-usability (2011-02-19) 4 commits
81
+ + Teach commit about CHERRY_PICK_HEAD
82
+ + bash: teach __git_ps1 about CHERRY_PICK_HEAD
83
+ + Introduce CHERRY_PICK_HEAD
84
+ + t3507: introduce pristine-detach helper
85
+
86
+* lt/rename-no-extra-copy-detection (2011-02-18) 3 commits
87
+ + diffcore-rename: improve estimate_similarity() heuristics
88
+ + diffcore-rename: properly honor the difference between -M and -C
89
+ + for_each_hash: allow passing a 'void *data' pointer to callback
90
+
91
+* mg/maint-difftool-vim-readonly (2011-02-25) 1 commit
92
+ + mergetool-lib: call vim in readonly mode for diffs
93
+
94
+* mh/p4 (2011-02-25) 1 commit
95
+ + git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
96
+
97
+* so/submodule-no-update-first-time (2011-02-17) 2 commits
98
+ + t7406: "git submodule update {--merge|--rebase]" with new submodules
99
+ + submodule: no [--merge|--rebase] when newly cloned
100
101
--------------------------------------------------
102
[Stalled]
@@ -60,6 +110,20 @@ Will merge to 'next'.
110
There was an objection to the tip one that determines the upstream in a
111
wrong way?
112
113
+* jc/diff-irreversible-delete (2011-02-28) 1 commit
114
+ - git diff -D: omit the preimage of deletes
115
+
116
+Just a POC.
117
+
118
+* jc/index-pack (2011-02-25) 5 commits
119
+ - index-pack --verify: read anomalous offsets from v2 idx file
120
+ - write_idx_file: need_large_offset() helper function
121
+ - index-pack: --verify
122
+ - write_idx_file: introduce a struct to hold idx customization options
123
+ - index-pack: group the delta-base array entries also by type
124
+
125
+Still a WIP.
126
+
127
* jc/complete-symmetric-diff (2011-02-23) 1 commit
128
- completion: complete "git diff ...branc<TAB>"
129
@@ -93,43 +157,62 @@ Somebody said that this is an expensive no-op?
157
--------------------------------------------------
158
[Cooking]
159
96
-* jn/maint-commit-missing-template (2011-02-25) 1 commit
97
- (merged to 'next' on 2011-02-25 at c95589d)
98
- + commit: error out for missing commit message template
160
+* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
161
+ - fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
162
+ - submodule update: Don't fetch when the submodule commit is already present
163
+ - fetch/pull: Don't recurse into a submodule when commits are already present
164
+ - Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
165
+ - config: teach the fetch.recurseSubmodules option the 'on-demand' value
166
+ - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
167
+ - fetch/pull: recurse into submodules when necessary
168
100
-* mg/maint-difftool-vim-readonly (2011-02-25) 1 commit
101
- (merged to 'next' on 2011-02-25 at 990579c)
102
- + mergetool-lib: call vim in readonly mode for diffs
169
+* mm/push-default-advice (2011-03-02) 2 commits
170
+ (merged to 'next' on 2011-03-09 at 160095b)
171
+ + push: better error message when no remote configured
172
+ + push: better error messages when push.default = tracking
173
104
-* fk/maint-cvsimport-early-failure (2011-01-31) 1 commit
105
- - git-cvsimport.perl: Bail out right away when reading from the server fails
174
+* sp/maint-fd-limit (2011-03-02) 3 commits
175
+ (merged to 'next' on 2011-03-09 at 389e97d)
176
+ + sha1_file.c: Don't retain open fds on small packs
177
+ + mingw: add minimum getrlimit() compatibility stub
178
+ + Limit file descriptors used by packs
179
107
-* jk/strbuf-vaddf (2011-02-25) 2 commits
108
- - strbuf: add strbuf_vaddf
109
- - compat: provide a fallback va_copy definition
180
+* uk/ls-remote-in-get-remote-url (2011-03-01) 2 commits
181
+ (merged to 'next' on 2011-03-09 at 09b570b)
182
+ + git-request-pull: open-code the only invocation of get_remote_url
183
+ + get_remote_url(): use the same data source as ls-remote to get remote urls
184
+
185
+* fk/maint-cvsimport-early-failure (2011-01-31) 1 commit
186
+ (merged to 'next' on 2011-03-09 at b4dee9e)
187
+ + git-cvsimport.perl: Bail out right away when reading from the server fails
188
+
189
+* jk/strbuf-vaddf (2011-03-08) 3 commits
190
+ (merged to 'next' on 2011-03-09 at 9651bc5)
191
+ + compat: fall back on __va_copy if available
192
+ + strbuf: add strbuf_vaddf
193
+ + compat: provide a fallback va_copy definition
194
(this branch is used by ab/i18n-st, jk/trace-sifter and jn/status-translatable.)
195
196
* jk/trace-sifter (2011-02-24) 6 commits
113
- - trace: give repo_setup trace its own key
114
- - add packet tracing debug code
115
- - trace: add trace_strbuf
116
- - trace: factor out "do we want to trace" logic
117
- - trace: refactor to support multiple env variables
118
- - trace: add trace_vprintf
197
+ (merged to 'next' on 2011-03-09 at 07841db)
198
+ + trace: give repo_setup trace its own key
199
+ + add packet tracing debug code
200
+ + trace: add trace_strbuf
201
+ + trace: factor out "do we want to trace" logic
202
+ + trace: refactor to support multiple env variables
203
+ + trace: add trace_vprintf
204
(this branch uses jk/strbuf-vaddf; is tangled with ab/i18n-st and jn/status-translatable.)
205
206
* jn/maint-instaweb-plack-fix (2011-02-26) 1 commit
122
- - git-instaweb: Change how gitweb.psgi is made runnable as standalone app
207
+ (merged to 'next' on 2011-03-09 at 3c9e14b)
208
+ + git-instaweb: Change how gitweb.psgi is made runnable as standalone app
209
210
* jn/status-translatable (2011-02-25) 3 commits
125
- - commit, status: use status_printf{,_ln,_more} helpers
126
- - commit: refer to commit template as s->fp
127
- - wt-status: add helpers for printing wt-status lines
128
- (this branch is used by ab/i18n-st and ab/i18n-st; uses jk/strbuf-vaddf; is tangled with jk/trace-sifter.)
129
-
130
-* mh/p4 (2011-02-25) 1 commit
131
- (merged to 'next' on 2011-02-26 at 1693331)
132
- + git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
211
+ (merged to 'next' on 2011-03-09 at d00d23d)
212
+ + commit, status: use status_printf{,_ln,_more} helpers
213
+ + commit: refer to commit template as s->fp
214
+ + wt-status: add helpers for printing wt-status lines
215
+ (this branch uses jk/strbuf-vaddf; is tangled with ab/i18n-st and jk/trace-sifter.)
216
217
* nd/rfc-add-u-full-tree (2011-02-07) 1 commit
218
- add: make "add -u" update full tree without pathspec
@@ -139,17 +222,16 @@ Somebody said that this is an expensive no-op?
222
- mergetool--lib: Sort tools alphabetically for easier lookup
223
224
* ss/mergetool--lib (2011-02-27) 2 commits
142
- - mergetool--lib: Add Beyond Compare 3 as a tool
143
- - mergetool--lib: Sort tools alphabetically for easier lookup
144
-
145
-Will merge to 'next'.
225
+ (merged to 'next' on 2011-03-09 at 004fb9c)
226
+ + mergetool--lib: Add Beyond Compare 3 as a tool
227
+ + mergetool--lib: Sort tools alphabetically for easier lookup
228
229
* nd/index-doc (2010-09-06) 1 commit
230
- doc: technical details about the index file format
231
232
I'll try to find time to fill in the details.
233
152
-* ab/i18n-st (2011-02-22) 74 commits
234
+* ab/i18n-st (2011-02-22) 79 commits
235
- i18n: git-shortlog basic messages
236
- i18n: git-revert split up "could not revert/apply" message
237
- i18n: git-revert literal "me" messages
@@ -221,107 +303,57 @@ I'll try to find time to fill in the details.
303
- i18n: git-init basic messages
304
- i18n: "make distclean" should clean up after "make pot"
305
- i18n: Makefile: "pot" target to extract messages marked for translation
306
+ - i18n: avoid conflict with ngettext from libintl
307
+ - i18n: add stub ngettext implementation
308
- i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
309
- i18n: add GETTEXT_POISON to simulate unfriendly translator
310
- i18n: add no-op _() and N_() wrappers
227
- (this branch uses jk/strbuf-vaddf, jn/status-translatable and jn/status-translatable; is tangled with jk/trace-sifter.)
228
-
229
-Rebased on other infrastructure adjustments (tentatively renamed the
230
-branch). I'd like to fast-track the basics (especially the bottom 3
231
-patches), and am even tempted to rebase other patches on 'pu' that are not
232
-yet in 'next' on top of them, to make the transition easier.
311
+ - commit, status: use status_printf{,_ln,_more} helpers
312
+ - commit: refer to commit template as s->fp
313
+ - wt-status: add helpers for printing wt-status lines
314
+ (this branch uses jk/strbuf-vaddf; is tangled with jk/trace-sifter and jn/status-translatable.)
315
234
-Unless there is something glaringly wrong, I'd merge up to 9018b8a (i18n:
235
-git-clone "Cloning into" message) to 'next' soonish, possibly rebasing
236
-other 'pu'-only topics on top of that commit.
316
+Added ngettext() stuff to the base.
317
+Will merge early parts to 'next'.
318
319
* jc/checkout-orphan-warning (2011-02-18) 1 commit
239
- - commit: give final warning when reattaching HEAD to leave commits behind
320
+ (merged to 'next' on 2011-03-09 at 765cf75)
321
+ + commit: give final warning when reattaching HEAD to leave commits behind
322
323
* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit
242
- - branch/checkout --track: Ensure that upstream branch is indeed a branch
243
-
244
-Will merge to 'next'.
245
-
246
-* jk/diffstat-binary (2011-02-19) 2 commits
247
- (merged to 'next' on 2011-02-23 at 49da967)
248
- + diff: don't retrieve binary blobs for diffstat
249
- + diff: handle diffstat of rewritten binary files
250
-
251
-* jk/fail-null-clone (2011-02-17) 1 commit
252
- (merged to 'next' on 2011-02-23 at a4217f5)
253
- + clone: die when trying to clone missing local path
324
+ (merged to 'next' on 2011-03-09 at 13a9328)
325
+ + branch/checkout --track: Ensure that upstream branch is indeed a branch
326
327
* jk/merge-rename-ux (2011-02-20) 6 commits
256
- - pull: propagate --progress to merge
257
- - merge: enable progress reporting for rename detection
258
- - add inexact rename detection progress infrastructure
259
- - commit: stop setting rename limit
260
- - bump rename limit defaults (again)
261
- - merge: improve inexact rename limit warning
262
-
263
-Will merge to 'next'.
264
-
265
-* jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit
266
- (merged to 'next' on 2011-02-23 at d754139)
267
- + tests: skip terminal output tests on OS X
268
-
269
-* js/cherry-pick-usability (2011-02-19) 4 commits
270
- (merged to 'next' on 2011-02-23 at 95db30e)
271
- + Teach commit about CHERRY_PICK_HEAD
272
- + bash: teach __git_ps1 about CHERRY_PICK_HEAD
273
- + Introduce CHERRY_PICK_HEAD
274
- + t3507: introduce pristine-detach helper
275
-
276
-* lt/rename-no-extra-copy-detection (2011-02-18) 3 commits
277
- (merged to 'next' on 2011-02-23 at 2c1f271)
278
- + diffcore-rename: improve estimate_similarity() heuristics
279
- + diffcore-rename: properly honor the difference between -M and -C
280
- + for_each_hash: allow passing a 'void *data' pointer to callback
281
-
282
-* mg/rev-list-one-side-only (2011-02-22) 6 commits
328
+ (merged to 'next' on 2011-03-09 at df1943a)
329
+ + pull: propagate --progress to merge
330
+ + merge: enable progress reporting for rename detection
331
+ + add inexact rename detection progress infrastructure
332
+ + commit: stop setting rename limit
333
+ + bump rename limit defaults (again)
334
+ + merge: improve inexact rename limit warning
335
+
336
+* mg/rev-list-one-side-only (2011-03-07) 9 commits
337
- t6007: test rev-list --cherry
338
- log --cherry: a synonym
339
+ - rev-list: documentation and test for --cherry-mark
340
+ - revision.c: introduce --cherry-mark
341
+ - rev-list/log: factor out revision mark generation
342
- rev-list: --left/right-only are mutually exclusive
343
- rev-list: documentation and test for --left/right-only
344
- t6007: Make sure we test --cherry-pick
345
- revlist.c: introduce --left/right-only for unsymmetric picking
346
290
-Will merge to 'next'; somebody may want to try losing many lines from
291
-format-patch before it hits 'master', though. Hint, hint...
292
-
293
-* so/submodule-no-update-first-time (2011-02-17) 2 commits
294
- (merged to 'next' on 2011-02-23 at 2c6e8c9)
295
- + t7406: "git submodule update {--merge|--rebase]" with new submodules
296
- + submodule: no [--merge|--rebase] when newly cloned
297
-
298
-* jh/submodule-fetch-on-demand (2011-02-23) 6 commits
299
- - submodule update: Don't fetch when the submodule commit is already present
300
- - fetch/pull: Don't recurse into a submodule when commits are already present
301
- - Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
302
- - config: teach the fetch.recurseSubmodules option the 'on-demand' value
303
- - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
304
- - fetch/pull: recurse into submodules when necessary
305
-
306
-How well has this been cooked?
347
+Will merge to 'next'. Looked much nicer than the previous round.
348
349
* jk/format-patch-multiline-header (2011-02-23) 3 commits
309
- - format-patch: rfc2047-encode newlines in headers
310
- - format-patch: wrap long header lines
311
- - strbuf: add fixed-length version of add_wrapped_text
312
-
313
-Will merge to 'next'.
350
+ (merged to 'next' on 2011-03-09 at f970fe3)
351
+ + format-patch: rfc2047-encode newlines in headers
352
+ + format-patch: wrap long header lines
353
+ + strbuf: add fixed-length version of add_wrapped_text
354
315
-* js/checkout-untracked-symlink (2011-02-20) 2 commits
316
- (merged to 'next' on 2011-02-23 at 52a35ce)
317
- + do not overwrite untracked symlinks
318
- + Demonstrate breakage: checkout overwrites untracked symlink with directory
319
-
320
-* jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit
321
- (merged to 'next' on 2011-02-23 at 58b03b1)
322
- + grep --no-index: honor pathspecs correctly
323
-
324
-* mz/rebase (2011-02-24) 33 commits
355
+* mz/rebase (2011-02-28) 34 commits
356
+ - rebase: define options in OPTIONS_SPEC
357
(merged to 'next' on 2011-02-25 at 52caa7a)
358
+ Makefile: do not install sourced rebase scripts
359
(merged to 'next' on 2011-02-22 at 3219155)
@@ -357,6 +389,3 @@ Will merge to 'next'.
389
+ rebase: read state outside loop
390
+ rebase: refactor reading of state
391
+ rebase: clearer names for directory variables
360
-
361
-Minor UI regression was reported but otherwise it looked like that the
362
-topic is in a good shape.