@matheusbsbs / matheus-bagliano / commits / b84a0297fe

What's cooking (2011/02 #05)

Junio C Hamano committed Feb 23, 2011 at 15:25 UTC b84a0297fe67e116bf904bfc0da497529fe73c2a
1 file changed +280 -169
whats-cooking.txt
+280 -169
@@ -1,51 +1,255 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Feb 2011, #04; Wed, 16)
3 -X-master-at: 5673d695fcce217b26d1a5956c1184ff62dc74f1
4 -X-next-at: a71843abac0d3679ef8ee8e818795c39d1910e44
2 +Subject: What's cooking in git.git (Feb 2011, #05; Wed, 23)
3 +X-master-at: 046613c5465e4fc0611f93a5ef31d3815fb50c22
4 +X-next-at: 426d48db1a78ffd5f2b882725c32f266e617529e
5
6 -What's cooking in git.git (Feb 2011, #04; Wed, 16)
6 +What's cooking in git.git (Feb 2011, #05; Wed, 23)
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 'maint' branch has accumulated enough minor fixes to produce 1.7.4.1,
13 -perhaps by the end of this week.
14 -
12 --------------------------------------------------
13 [New Topics]
14
18 -* jh/do-not-track-non-branches (2011-02-16) 1 commit
15 +* ab/i18n (2011-02-22) 73 commits
16 + - i18n: git-shortlog basic messages
17 + - i18n: git-revert split up "could not revert/apply" message
18 + - i18n: git-revert literal "me" messages
19 + - i18n: git-revert "Your local changes" message
20 + - i18n: git-revert basic messages
21 + - i18n: git-notes GIT_NOTES_REWRITE_MODE error message
22 + - i18n: git-notes basic commands
23 + - i18n: git-gc "Auto packing the repository" message
24 + - i18n: git-gc basic messages
25 + - i18n: git-describe basic messages
26 + - i18n: git-clean clean.requireForce messages
27 + - i18n: git-clean basic messages
28 + - i18n: git-bundle basic messages
29 + - i18n: git-archive basic messages
30 + - i18n: git-status "renamed: " message
31 + - i18n: git-status "Initial commit" message
32 + - i18n: git-status "Changes to be committed" message
33 + - i18n: git-status shortstatus messages
34 + - i18n: git-status "nothing to commit" messages
35 + - i18n: git-status basic messages
36 + - i18n: git-push "prevent you from losing" message
37 + - i18n: git-push basic messages
38 + - i18n: git-tag tag_template message
39 + - i18n: git-tag basic messages
40 + - i18n: git-reset "Unstaged changes after reset" message
41 + - i18n: git-reset reset_type_names messages
42 + - i18n: git-reset basic messages
43 + - i18n: git-rm basic messages
44 + - i18n: git-mv "bad" messages
45 + - i18n: git-mv basic messages
46 + - i18n: git-merge "Wonderful" message
47 + - i18n: git-merge "You have not concluded your merge" messages
48 + - i18n: git-merge "Updating %s..%s" message
49 + - i18n: git-merge basic messages
50 + - i18n: git-log "--OPT does not make sense" messages
51 + - i18n: git-log basic messages
52 + - i18n: git-grep "--open-files-in-pager" message
53 + - i18n: git-grep basic messages
54 + - i18n: git-fetch split up "(non-fast-forward)" message
55 + - i18n: git-fetch update_local_ref messages
56 + - i18n: git-fetch formatting messages
57 + - i18n: git-fetch basic messages
58 + - i18n: git-diff basic messages
59 + - i18n: git-commit advice messages
60 + - i18n: git-commit "enter the commit message" message
61 + - i18n: git-commit print_summary messages
62 + - i18n: git-commit formatting messages
63 + - i18n: git-commit "middle of a merge" message
64 + - i18n: git-commit basic messages
65 + - i18n: git-checkout "Switched to a .. branch" message
66 + - i18n: git-checkout "HEAD is now at" message
67 + - i18n: git-checkout describe_detached_head messages
68 + - i18n: git-checkout: our/their version message
69 + - i18n: git-checkout basic messages
70 + - i18n: git-branch "(no branch)" message
71 + - i18n: git-branch "git branch -v" messages
72 + - i18n: git-branch "Deleted branch [...]" message
73 + - i18n: git-branch "remote branch '%s' not found" message
74 + - i18n: git-branch basic messages
75 + - i18n: git-add "Unstaged changes" message
76 + - i18n: git-add "remove '%s'" message
77 + - i18n: git-add "did not match any files" message
78 + - i18n: git-add "The following paths are ignored" message
79 + - i18n: git-add basic messages
80 + - i18n: git-clone "Cloning into" message
81 + - i18n: git-clone "Cloning into" message
82 + - i18n: git-clone basic messages
83 + - i18n: git-init "Initialized [...] repository" message
84 + - i18n: git-init basic messages
85 + - i18n: Makefile: "pot" target to extract messages marked for translation
86 + - i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
87 + - i18n: add GETTEXT_POISON to simulate translated messages unfriendly translator
88 + - i18n: add no-op _() and N_() wrappers
89 +
90 +Re^4-roll, coordinated between Ævar and Jonathan.
91 +
92 +I'd like to fast-track the basics (especially the bottom 3 patches), and
93 +am even tempted to rebase other patches on 'pu' that are not yet in 'next'
94 +on top of them, to make the transition easier, so please lend extra sets
95 +of eyeballs on an earlier ones to make sure they are sane (I thought they
96 +were, but I am far from perfect).
97 +
98 +* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
99 + - Look for password in both CVS and CVSNT password files.
100 +
101 +* jc/checkout-orphan-warning (2011-02-18) 1 commit
102 + - commit: give final warning when reattaching HEAD to leave commits behind
103 +
104 +Likes, dislikes?
105 +
106 +* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit
107 - branch/checkout --track: Ensure that upstream branch is indeed a branch
108
21 -Conflicts with tr/maint-branch-no-track-head but we should probably say
22 -that this supersedes it.
109 +This supersedes "do not track HEAD" from Thomas.
110 +
111 +* jk/diffstat-binary (2011-02-19) 2 commits
112 + (merged to 'next' on 2011-02-23 at 49da967)
113 + + diff: don't retrieve binary blobs for diffstat
114 + + diff: handle diffstat of rewritten binary files
115 +
116 +* jk/fail-null-clone (2011-02-17) 1 commit
117 + (merged to 'next' on 2011-02-23 at a4217f5)
118 + + clone: die when trying to clone missing local path
119 +
120 +* jk/merge-rename-ux (2011-02-20) 6 commits
121 + - pull: propagate --progress to merge
122 + - merge: enable progress reporting for rename detection
123 + - add inexact rename detection progress infrastructure
124 + - commit: stop setting rename limit
125 + - bump rename limit defaults (again)
126 + - merge: improve inexact rename limit warning
127 +
128 +The above three all seemed sensible improvements.
129 +
130 +* jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit
131 + (merged to 'next' on 2011-02-23 at d754139)
132 + + tests: skip terminal output tests on OS X
133 +
134 +* js/cherry-pick-usability (2011-02-19) 4 commits
135 + (merged to 'next' on 2011-02-23 at 95db30e)
136 + + Teach commit about CHERRY_PICK_HEAD
137 + + bash: teach __git_ps1 about CHERRY_PICK_HEAD
138 + + Introduce CHERRY_PICK_HEAD
139 + + t3507: introduce pristine-detach helper
140 +
141 +* js/detach-doc (2011-02-20) 1 commit
142 + (merged to 'next' on 2011-02-21 at c384c3c)
143 + + git-checkout.txt: improve detached HEAD documentation
144 +
145 +* lt/rename-no-extra-copy-detection (2011-02-18) 3 commits
146 + (merged to 'next' on 2011-02-23 at 2c1f271)
147 + + diffcore-rename: improve estimate_similarity() heuristics
148 + + diffcore-rename: properly honor the difference between -M and -C
149 + + for_each_hash: allow passing a 'void *data' pointer to callback
150 +
151 +* mg/rev-list-one-side-only (2011-02-22) 6 commits
152 + - t6007: test rev-list --cherry
153 + - log --cherry: a synonym
154 + - rev-list: --left/right-only are mutually exclusive
155 + - rev-list: documentation and test for --left/right-only
156 + - t6007: Make sure we test --cherry-pick
157 + - revlist.c: introduce --left/right-only for unsymmetric picking
158 +
159 +* so/submodule-no-update-first-time (2011-02-17) 2 commits
160 + (merged to 'next' on 2011-02-23 at 2c6e8c9)
161 + + t7406: "git submodule update {--merge|--rebase]" with new submodules
162 + + submodule: no [--merge|--rebase] when newly cloned
163 +
164 +* va/p4 (2011-02-20) 2 commits
165 + (merged to 'next' on 2011-02-21 at d981b23)
166 + + git-p4: Add copy detection support
167 + + git-p4: Improve rename detection support
168 +
169 +* jc/complete-symmetric-diff (2011-02-23) 1 commit
170 + - completion: complete "git diff ...branc<TAB>"
171 +
172 +* jh/submodule-fetch-on-demand (2011-02-23) 6 commits
173 + - submodule update: Don't fetch when the submodule commit is already present
174 + - fetch/pull: Don't recurse into a submodule when commits are already present
175 + - Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
176 + - config: teach the fetch.recurseSubmodules option the 'on-demand' value
177 + - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
178 + - fetch/pull: recurse into submodules when necessary
179 +
180 +* jk/format-patch-multiline-header (2011-02-23) 2 commits
181 + - format-patch: wrap long header lines
182 + - strbuf: add fixed-length version of add_wrapped_text
183 +
184 +* cp/mergetool-beyondcompare (2011-02-18) 1 commit
185 + - mergetool--lib: add support for beyond compare
186 +
187 +May want to have an independent success report on Windows.
188
24 -* jh/push-default-upstream-configname (2011-02-16) 1 commit
25 - - push.default: Rename 'tracking' to 'upstream'
189 +--------------------------------------------------
190 +[Stalled]
191
27 -This is not "renaming" in the sense that breaks existing practice, but
28 -giving a new official name and deprecating the existing one.
192 +* jk/tag-contains (2010-07-05) 4 commits
193 + - Why is "git tag --contains" so slow?
194 + - default core.clockskew variable to one day
195 + - limit "contains" traversals based on commit timestamp
196 + - tag: speed up --contains calculation
197
30 -* js/maint-merge-use-prepare-commit-msg-hook (2011-02-14) 1 commit
31 - - merge: honor prepare-commit-msg hook
198 +The idea of the bottom one is probably Ok, except that the use of object
199 +flags needs to be rethought, or at least the helper needs to be moved to
200 +builtin/tag.c to make it clear that it should not be used outside the
201 +current usage context.
202
33 -Will merge to 'next'.
203 +* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
204 + . diffcore-rename: fall back to -C when -C -C busts the rename limit
205 + . diffcore-rename: record filepair for rename src
206 + . diffcore-rename: refactor "too many candidates" logic
207
35 -* mg/patch-id (2011-02-16) 2 commits
36 - - git-patch-id: do not trip over "no newline" markers
37 - - git-patch-id: test for "no newline" markers
208 +* nd/index-doc (2010-09-06) 1 commit
209 + . doc: technical details about the index file format
210
39 -The tip one is too strict in determining "\ No newline..." that needs to
40 -be loosened to be in line with what "git apply" does.
211 +--------------------------------------------------
212 +[Cooking]
213
42 -* mg/placeholders-are-lowercase (2011-02-15) 4 commits
43 - - Make <identifier> lowercase as per CodingGuidelines
44 - - Make <identifier> lowercase as per CodingGuidelines
45 - - Make <identifier> lowercase as per CodingGuidelines
46 - - CodingGuidelines: downcase placeholders in usage messages
214 +* js/checkout-untracked-symlink (2011-02-20) 2 commits
215 + (merged to 'next' on 2011-02-23 at 52a35ce)
216 + + do not overwrite untracked symlinks
217 + + Demonstrate breakage: checkout overwrites untracked symlink with directory
218 +
219 +* pw/p4 (2011-02-19) 8 commits
220 + (merged to 'next' on 2011-02-21 at 1a7b7d2)
221 + + git-p4: support clone --bare
222 + + git-p4: decode p4 wildcard characters
223 + + git-p4: better message for "git-p4 sync" when not cloned
224 + + git-p4: reinterpret confusing p4 message
225 + + git-p4: accommodate new move/delete type in p4
226 + + git-p4: add missing newline in initial import message
227 + + git-p4: fix key error for p4 problem
228 + + git-p4: test script
229
48 -Will merge to 'next'.
230 +* jh/push-default-upstream-configname (2011-02-16) 1 commit
231 + (merged to 'next' on 2011-02-23 at b5c25fa)
232 + + push.default: Rename 'tracking' to 'upstream'
233 +
234 +This is not "renaming" in the sense that breaks existing practice, but
235 +giving a new official name and deprecating the existing one.
236 +
237 +* js/maint-merge-use-prepare-commit-msg-hook (2011-02-14) 1 commit
238 + (merged to 'next' on 2011-02-22 at 6458c4b)
239 + + merge: honor prepare-commit-msg hook
240 +
241 +* mg/patch-id (2011-02-17) 2 commits
242 + (merged to 'next' on 2011-02-22 at 6f4acd8)
243 + + git-patch-id: do not trip over "no newline" markers
244 + + git-patch-id: test for "no newline" markers
245 +
246 +* mg/placeholders-are-lowercase (2011-02-17) 5 commits
247 + (merged to 'next' on 2011-02-22 at 2754e21)
248 + + Make <identifier> lowercase in Documentation
249 + + Make <identifier> lowercase as per CodingGuidelines
250 + + Make <identifier> lowercase as per CodingGuidelines
251 + + Make <identifier> lowercase as per CodingGuidelines
252 + + CodingGuidelines: downcase placeholders in usage messages
253
254 * mo/perl-bidi-pipe-envfix (2011-02-15) 1 commit
255 (merged to 'next' on 2011-02-15 at c36e816)
@@ -54,129 +258,55 @@ Will merge to 'next'.
258 Looked reasonable.
259
260 * nd/sorted-builtin-command-list (2011-02-15) 1 commit
57 - - git.c: reorder builtin command list
58 -
59 -Looked Ok and low impact. Will merge to 'next'.
261 + (merged to 'next' on 2011-02-22 at 91fccd1)
262 + + git.c: reorder builtin command list
263
264 * sp/maint-smart-http-sans-100-continue (2011-02-15) 1 commit
265 (merged to 'next' on 2011-02-15 at 553e3e5)
266 + smart-http: Don't use Expect: 100-Continue
267
268 * jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit
66 - - grep --no-index: honor pathspecs correctly
269 + (merged to 'next' on 2011-02-23 at 58b03b1)
270 + + grep --no-index: honor pathspecs correctly
271 (this branch uses nd/struct-pathspec; is tangled with en/object-list-with-pathspec.)
272
69 ---------------------------------------------------
70 -[Stalled]
71 -
72 -* pw/p4 (2011-02-05) 8 commits
73 - - git-p4: support clone --bare
74 - - git-p4: decode p4 wildcard characters
75 - - git-p4: better message for "git-p4 sync" when not cloned
76 - - git-p4: reinterpret confusing p4 message
77 - - git-p4: accommodate new move/delete type in p4
78 - - git-p4: add missing newline in initial import message
79 - - git-p4: fix key error for p4 problem
80 - - git-p4: test script
81 -
82 -Will be re-rolled after collecting comments (Pete Wyckoff, 2011-02-07).
83 -
84 -* js/checkout-untracked-symlink (2011-02-05) 2 commits
85 - . (weatherbaloon) needs in-code explanation updates
86 - . Demonstrate breakage: checkout overwrites untracked symlink with directory
87 -
88 -The "fix" seems to test t6035, #2.
89 -
90 -Will discard the following topics carried over since pre-1.7.4 era.
91 -
92 -* nd/index-doc (2010-09-06) 1 commit
93 - - doc: technical details about the index file format
94 -
95 -Half-written but it is a good start. I may need to give some help in
96 -describing more recent index extensions.
97 -
98 -* cb/ignored-paths-are-precious (2010-08-21) 1 commit
99 - - checkout/merge: optionally fail operation when ignored files need to be overwritten
100 -
101 -This needs tests; also we know of longstanding bugs in related area that
102 -needs to be addressed---they do not have to be part of this series but
103 -their reproduction recipe would belong to the test script for this topic.
104 -
105 -It would hurt users to make the new feature on by default, especially the
106 -ones with subdirectories that come and go.
107 -
108 -* jk/tag-contains (2010-07-05) 4 commits
109 - - Why is "git tag --contains" so slow?
110 - - default core.clockskew variable to one day
111 - - limit "contains" traversals based on commit timestamp
112 - - tag: speed up --contains calculation
113 -
114 -The idea of the bottom one is probably Ok, except that the use of object
115 -flags needs to be rethought, or at least the helper needs to be moved to
116 -builtin/tag.c to make it clear that it should not be used outside the
117 -current usage context.
118 -
119 -* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
120 - - diffcore-rename: fall back to -C when -C -C busts the rename limit
121 - - diffcore-rename: record filepair for rename src
122 - - diffcore-rename: refactor "too many candidates" logic
123 -
124 -IIRC, this was a weather-baloon "if you wanted to, this may be how you
125 -would do it" without test updates. People who care need to help moving
126 -things forward.
127 -
128 -* ab/p4 (2011-01-11) 1 commit
129 - - git-p4: correct indenting and formatting
130 -
131 -Lacks sign-off. There are a few topics in the same area discussed among
132 -Pete Wyckoff, Vitor Antunes and Tor Arvid Lund that I won't be picking up
133 -myself before the dust settles, so I'd discard this soonish, and wait for
134 -the resolution of the other topics.
135 -
136 -* tr/maint-branch-no-track-head (2010-12-14) 1 commit
137 - - branch: do not attempt to track HEAD implicitly
138 -
139 -See jh/do-not-track-non-branches topic.
140 -
141 ---------------------------------------------------
142 -[Cooking]
143 -
273 * mz/rebase (2011-02-09) 32 commits
145 - - rebase: use @{upstream} if no upstream specified
146 - - rebase -i: remove unnecessary state rebase-root
147 - - rebase -i: don't read unused variable preserve_merges
148 - - git-rebase--am: remove unnecessary --3way option
149 - - rebase -m: don't print exit code 2 when merge fails
150 - - rebase -m: remember allow_rerere_autoupdate option
151 - - rebase: remember strategy and strategy options
152 - - rebase: remember verbose option
153 - - rebase: extract code for writing basic state
154 - - rebase: factor out sub command handling
155 - - rebase: make -v a tiny bit more verbose
156 - - rebase -i: align variable names
157 - - rebase: show consistent conflict resolution hint
158 - - rebase: extract am code to new source file
159 - - rebase: extract merge code to new source file
160 - - rebase: remove $branch as synonym for $orig_head
161 - - rebase -i: support --stat
162 - - rebase: factor out call to pre-rebase hook
163 - - rebase: factor out clean work tree check
164 - - rebase: factor out reference parsing
165 - - rebase: reorder validation steps
166 - - rebase -i: remove now unnecessary directory checks
167 - - rebase: factor out command line option processing
168 - - rebase: align variable content
169 - - rebase: align variable names
170 - - rebase: stricter check of standalone sub command
171 - - rebase: act on command line outside parsing loop
172 - - rebase: improve detection of rebase in progress
173 - - rebase: remove unused rebase state 'prev_head'
174 - - rebase: read state outside loop
175 - - rebase: refactor reading of state
176 - - rebase: clearer names for directory variables
274 + (merged to 'next' on 2011-02-22 at 3219155)
275 + + rebase: use @{upstream} if no upstream specified
276 + + rebase -i: remove unnecessary state rebase-root
277 + + rebase -i: don't read unused variable preserve_merges
278 + + git-rebase--am: remove unnecessary --3way option
279 + + rebase -m: don't print exit code 2 when merge fails
280 + + rebase -m: remember allow_rerere_autoupdate option
281 + + rebase: remember strategy and strategy options
282 + + rebase: remember verbose option
283 + + rebase: extract code for writing basic state
284 + + rebase: factor out sub command handling
285 + + rebase: make -v a tiny bit more verbose
286 + + rebase -i: align variable names
287 + + rebase: show consistent conflict resolution hint
288 + + rebase: extract am code to new source file
289 + + rebase: extract merge code to new source file
290 + + rebase: remove $branch as synonym for $orig_head
291 + + rebase -i: support --stat
292 + + rebase: factor out call to pre-rebase hook
293 + + rebase: factor out clean work tree check
294 + + rebase: factor out reference parsing
295 + + rebase: reorder validation steps
296 + + rebase -i: remove now unnecessary directory checks
297 + + rebase: factor out command line option processing
298 + + rebase: align variable content
299 + + rebase: align variable names
300 + + rebase: stricter check of standalone sub command
301 + + rebase: act on command line outside parsing loop
302 + + rebase: improve detection of rebase in progress
303 + + rebase: remove unused rebase state 'prev_head'
304 + + rebase: read state outside loop
305 + + rebase: refactor reading of state
306 + + rebase: clearer names for directory variables
307
308 Minor UI regression was reported but otherwise it looked like that the
179 -topic is in a good shape. Will merge to 'next'.
309 +topic is in a good shape.
310
311 * jh/merge-sans-branch (2011-02-10) 4 commits
312 . merge: add support for merging from upstream by default
@@ -187,24 +317,21 @@ topic is in a good shape. Will merge to 'next'.
317 There was an objection to the tip one that determines the upstream in a
318 wrong way?
319
190 -* lp/config-vername-check (2011-02-10) 4 commits
191 - - Fix-up detection of configuration key without section or variable
192 - - Disallow empty section and variable names
193 - - Fix-up configuration variable name parsing
194 - - Sanity-check config variable names
195 -
196 -Will merge to 'next' but the two "Fix-up"s should be squashed in first.
320 +* lp/config-vername-check (2011-02-01) 2 commits
321 + (merged to 'next' on 2011-02-23 at 426d48d)
322 + + Disallow empty section and variable names
323 + + Sanity-check config variable names
324
325 * mz/rerere-remaining (2011-02-16) 2 commits
199 - - mergetool: don't skip modify/remove conflicts
200 - - rerere "remaining"
326 + (merged to 'next' on 2011-02-22 at fa2d5ab)
327 + + mergetool: don't skip modify/remove conflicts
328 + + rerere "remaining"
329
202 -Looked much better than my weatherbaloon patch. Will merge to 'next'.
330 +Looked much better than my weatherbaloon patch.
331
332 * nd/hash-object-sanity (2011-02-05) 1 commit
205 - - Make hash-object more robust against malformed objects
206 -
207 -Should be low-impact enough. Will merge to 'next'.
333 + (merged to 'next' on 2011-02-22 at 09acf6f)
334 + + Make hash-object more robust against malformed objects
335
336 * hv/mingw-fs-funnies (2011-02-07) 5 commits
337 (merged to 'next' on 2011-02-09 at 3d0bb1a)
@@ -258,19 +385,3 @@ Rerolled and seems ready to move forward.
385 + checkout: fix bug with ambiguous refs
386
387 The topic has become about "checkout --detach" ;-).
261 -
262 ---------------------------------------------------
263 -[Discarded]
264 -
265 -* jc/rerere-remaining (2011-01-06) 1 commit
266 - . rerere "remaining"
267 -
268 -Just a handful of weatherballoon patches without proper tests, in response
269 -to feature/minor fix requests.
270 -
271 -* ab/i18n (2010-10-07) 161 commits
272 - . po/de.po: complete German translation
273 - ....
274 - . t7004-tag.sh: re-arrange git tag comment for clarity
275 -
276 -Will be re-rolled.