What's cooking (2011/02 #04)
Junio C Hamano committed
Feb 16, 2011 at 15:19 UTC
103d04dc8be6a844a85494d458d0cd0ed4b122ae
1 file changed
+127
-264
whats-cooking.txt
+127
-264
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Feb 2011, #03; Wed, 9)
3
-X-master-at: 1a9fe453263137be7d42e6fbfc041b5b2d9521d7
4
-X-next-at: 3d0bb1aecb5960274bb37fb5692cb0f4b10d7706
2
+Subject: What's cooking in git.git (Feb 2011, #04; Wed, 16)
3
+X-master-at: 5673d695fcce217b26d1a5956c1184ff62dc74f1
4
+X-next-at: a71843abac0d3679ef8ee8e818795c39d1910e44
5
6
-What's cooking in git.git (Feb 2011, #03; Wed, 9)
6
+What's cooking in git.git (Feb 2011, #04; Wed, 16)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -15,78 +15,80 @@ perhaps by the end of this week.
15
--------------------------------------------------
16
[New Topics]
17
18
-* jh/merge-sans-branch (2011-02-08) 3 commits
19
- - merge: optionally merge from upstream when run without argument
20
- - builtin/merge.c: Add function per_branch_config
21
- - builtin/merge.c: Add setup_merge_commit function
18
+* jh/do-not-track-non-branches (2011-02-16) 1 commit
19
+ - branch/checkout --track: Ensure that upstream branch is indeed a branch
20
23
-* js/checkout-untracked-symlink (2011-02-05) 2 commits
24
- - (weatherbaloon) needs in-code explanation updates
25
- - Demonstrate breakage: checkout overwrites untracked symlink with directory
21
+Conflicts with tr/maint-branch-no-track-head but we should probably say
22
+that this supersedes it.
23
27
-* lp/config-vername-check (2011-01-21) 2 commits
28
- - Documentation fixes in git-config
29
- - Sanity-check config variable names
24
+* jh/push-default-upstream-configname (2011-02-16) 1 commit
25
+ - push.default: Rename 'tracking' to 'upstream'
26
31
-* mz/rerere-remaining (2011-02-07) 1 commit
32
- - mergetool: don't skip modify/remove conflicts
33
- (this branch uses jc/rerere-remaining.)
27
+This is not "renaming" in the sense that breaks existing practice, but
28
+giving a new official name and deprecating the existing one.
29
35
-* nd/hash-object-sanity (2011-02-05) 1 commit
36
- - Make hash-object more robust against malformed objects
30
+* js/maint-merge-use-prepare-commit-msg-hook (2011-02-14) 1 commit
31
+ - merge: honor prepare-commit-msg hook
32
38
---------------------------------------------------
39
-[Graduated to "master"]
40
-
41
-* ae/better-template-failure-report (2010-12-18) 1 commit
42
- (merged to 'next' on 2011-02-03 at 3b269c9)
43
- + Improve error messages when temporary file creation fails
44
-
45
-* cb/setup (2010-12-27) 1 commit
46
- (merged to 'next' on 2011-02-03 at 073980f)
47
- + setup: translate symlinks in filename when using absolute paths
48
-
49
-* ef/alias-via-run-command (2011-01-07) 1 commit
50
- (merged to 'next' on 2011-02-03 at 4ce47ce)
51
- + alias: use run_command api to execute aliases
52
-
53
-* jc/fsck-fixes (2011-01-26) 2 commits
54
- (merged to 'next' on 2011-02-03 at 98e1c63)
55
- + fsck: do not give up too early in fsck_dir()
56
- + fsck: drop unused parameter from traverse_one_object()
57
-
58
-* jc/unpack-trees (2010-12-22) 2 commits
59
- (merged to 'next' on 2011-02-03 at 5bd48f8)
60
- + unpack_trees(): skip trees that are the same in all input
61
- + unpack-trees.c: cosmetic fix
62
-
63
-* jn/cherry-pick-strategy-option (2010-12-10) 1 commit
64
- (merged to 'next' on 2011-02-03 at 1c10f16)
65
- + cherry-pick/revert: add support for -X/--strategy-option
66
-
67
-* jn/unpack-lstat-failure-report (2011-01-12) 2 commits
68
- (merged to 'next' on 2011-02-03 at 76586d2)
69
- + unpack-trees: handle lstat failure for existing file
70
- + unpack-trees: handle lstat failure for existing directory
71
-
72
-* rr/fi-import-marks-if-exists (2011-01-15) 1 commit
73
- (merged to 'next' on 2011-02-03 at 8c9d4ce)
74
- + fast-import: Introduce --import-marks-if-exists
75
-
76
-* tr/diff-words-test (2011-01-18) 4 commits
77
- (merged to 'next' on 2011-02-03 at d346665)
78
- + t4034 (diff --word-diff): add a minimum Perl drier test vector
79
- + t4034 (diff --word-diff): style suggestions
80
- + userdiff: simplify word-diff safeguard
81
- + t4034: bulk verify builtin word regex sanity
82
-
83
-* tr/merge-unborn-clobber (2010-08-22) 1 commit
84
- (merged to 'next' on 2011-02-03 at ccfc03d)
85
- + Exhibit merge bug that clobbers index&WT
33
+Will merge to 'next'.
34
+
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
38
+
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.
41
+
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
47
+
48
+Will merge to 'next'.
49
+
50
+* mo/perl-bidi-pipe-envfix (2011-02-15) 1 commit
51
+ (merged to 'next' on 2011-02-15 at c36e816)
52
+ + perl: command_bidi_pipe() method should set-up git environmens
53
+
54
+Looked reasonable.
55
+
56
+* 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'.
60
+
61
+* sp/maint-smart-http-sans-100-continue (2011-02-15) 1 commit
62
+ (merged to 'next' on 2011-02-15 at 553e3e5)
63
+ + smart-http: Don't use Expect: 100-Continue
64
+
65
+* jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit
66
+ - grep --no-index: honor pathspecs correctly
67
+ (this branch uses nd/struct-pathspec; is tangled with en/object-list-with-pathspec.)
68
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
@@ -126,17 +128,21 @@ things forward.
128
* ab/p4 (2011-01-11) 1 commit
129
- git-p4: correct indenting and formatting
130
129
-Lacks sign-off but is trivial.
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
134
-Probably needs a re-roll to exclude either (1) any ref outside the
135
-hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs
136
-outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels
137
-safer and saner.
139
+See jh/do-not-track-non-branches topic.
140
+
141
+--------------------------------------------------
142
+[Cooking]
143
139
-* mz/rebase (2010-12-28) 31 commits
144
+* 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
@@ -169,197 +175,36 @@ safer and saner.
175
- rebase: refactor reading of state
176
- rebase: clearer names for directory variables
177
172
-Re-roll posted, but I haven't picked it up yet.
178
+Minor UI regression was reported but otherwise it looked like that the
179
+topic is in a good shape. Will merge to 'next'.
180
174
-* ab/i18n (2010-10-07) 161 commits
175
- - po/de.po: complete German translation
176
- - po/sv.po: add Swedish translation
177
- - gettextize: git-bisect bisect_next_check "You need to" message
178
- - gettextize: git-bisect [Y/n] messages
179
- - gettextize: git-bisect bisect_replay + $1 messages
180
- - gettextize: git-bisect bisect_reset + $1 messages
181
- - gettextize: git-bisect bisect_run + $@ messages
182
- - gettextize: git-bisect die + eval_gettext messages
183
- - gettextize: git-bisect die + gettext messages
184
- - gettextize: git-bisect echo + eval_gettext message
185
- - gettextize: git-bisect echo + gettext messages
186
- - gettextize: git-bisect gettext + echo message
187
- - gettextize: git-bisect add git-sh-i18n
188
- - gettextize: git-stash drop_stash say/die messages
189
- - gettextize: git-stash "unknown option" message
190
- - gettextize: git-stash die + eval_gettext $1 messages
191
- - gettextize: git-stash die + eval_gettext $* messages
192
- - gettextize: git-stash die + eval_gettext messages
193
- - gettextize: git-stash die + gettext messages
194
- - gettextize: git-stash say + gettext messages
195
- - gettextize: git-stash echo + gettext message
196
- - gettextize: git-stash add git-sh-i18n
197
- - gettextize: git-submodule "blob" and "submodule" messages
198
- - gettextize: git-submodule "path not initialized" message
199
- - gettextize: git-submodule "[...] path is ignored" message
200
- - gettextize: git-submodule "Entering [...]" message
201
- - gettextize: git-submodule $errmsg messages
202
- - gettextize: git-submodule "Submodule change[...]" messages
203
- - gettextize: git-submodule "cached cannot be used" message
204
- - gettextize: git-submodule $update_module say + die messages
205
- - gettextize: git-submodule die + eval_gettext messages
206
- - gettextize: git-submodule say + eval_gettext messages
207
- - gettextize: git-submodule echo + eval_gettext messages
208
- - gettextize: git-submodule add git-sh-i18n
209
- - gettextize: git-pull "rebase against" / "merge with" messages
210
- - gettextize: git-pull "[...] not currently on a branch" message
211
- - gettextize: git-pull "You asked to pull" message
212
- - gettextize: git-pull split up "no candidate" message
213
- - gettextize: git-pull eval_gettext + warning message
214
- - gettextize: git-pull eval_gettext + die message
215
- - gettextize: git-pull die messages
216
- - gettextize: git-pull add git-sh-i18n
217
- - gettext docs: add "Testing marked strings" section to po/README
218
- - gettext docs: the Git::I18N Perl interface
219
- - gettext docs: the git-sh-i18n.sh Shell interface
220
- - gettext docs: the gettext.h C interface
221
- - gettext docs: add "Marking strings for translation" section in po/README
222
- - gettext docs: add a "Testing your changes" section to po/README
223
- - po/pl.po: add Polish translation
224
- - po/hi.po: add Hindi Translation
225
- - po/en_GB.po: add British English translation
226
- - po/de.po: add German translation
227
- - Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=YesPlease
228
- - gettext docs: add po/README file documenting Git's gettext
229
- - gettextize: git-am printf(1) message to eval_gettext
230
- - gettextize: git-am core say messages
231
- - gettextize: git-am "Apply?" message
232
- - gettextize: git-am clean_abort messages
233
- - gettextize: git-am cannot_fallback messages
234
- - gettextize: git-am die messages
235
- - gettextize: git-am eval_gettext messages
236
- - gettextize: git-am multi-line getttext $msg; echo
237
- - gettextize: git-am one-line gettext $msg; echo
238
- - gettextize: git-am add git-sh-i18n
239
- - gettext tests: add GETTEXT_POISON tests for shell scripts
240
- - gettext tests: add GETTEXT_POISON support for shell scripts
241
- - Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT
242
- - Makefile: add GNU_GETTEXT, set when we expect GNU gettext
243
- - gettextize: git-shortlog basic messages
244
- - gettextize: git-revert split up "could not revert/apply" message
245
- - gettextize: git-revert literal "me" messages
246
- - gettextize: git-revert "Your local changes" message
247
- - gettextize: git-revert basic messages
248
- - gettextize: git-notes "Refusing to %s notes in %s" message
249
- - gettextize: git-notes GIT_NOTES_REWRITE_MODE error message
250
- - gettextize: git-notes basic commands
251
- - gettextize: git-gc "Auto packing the repository" message
252
- - gettextize: git-gc basic messages
253
- - gettextize: git-describe basic messages
254
- - gettextize: git-clean clean.requireForce messages
255
- - gettextize: git-clean basic messages
256
- - gettextize: git-bundle basic messages
257
- - gettextize: git-archive basic messages
258
- - gettextize: git-status "renamed: " message
259
- - gettextize: git-status "Initial commit" message
260
- - gettextize: git-status "Changes to be committed" message
261
- - gettextize: git-status shortstatus messages
262
- - gettextize: git-status "nothing to commit" messages
263
- - gettextize: git-status basic messages
264
- - gettextize: git-push "prevent you from losing" message
265
- - gettextize: git-push basic messages
266
- - gettextize: git-tag tag_template message
267
- - gettextize: git-tag basic messages
268
- - gettextize: git-reset "Unstaged changes after reset" message
269
- - gettextize: git-reset reset_type_names messages
270
- - gettextize: git-reset basic messages
271
- - gettextize: git-rm basic messages
272
- - gettextize: git-mv "bad" messages
273
- - gettextize: git-mv basic messages
274
- - gettextize: git-merge "Wonderful" message
275
- - gettextize: git-merge "You have not concluded your merge" messages
276
- - gettextize: git-merge "Updating %s..%s" message
277
- - gettextize: git-merge basic messages
278
- - gettextize: git-log "--OPT does not make sense" messages
279
- - gettextize: git-log basic messages
280
- - gettextize: git-grep "--open-files-in-pager" message
281
- - gettextize: git-grep basic messages
282
- - gettextize: git-fetch split up "(non-fast-forward)" message
283
- - gettextize: git-fetch update_local_ref messages
284
- - gettextize: git-fetch formatting messages
285
- - gettextize: git-fetch basic messages
286
- - gettextize: git-diff basic messages
287
- - gettextize: git-commit advice messages
288
- - gettextize: git-commit "enter the commit message" message
289
- - gettextize: git-commit print_summary messages
290
- - gettextize: git-commit formatting messages
291
- - gettextize: git-commit "middle of a merge" message
292
- - gettextize: git-commit basic messages
293
- - gettextize: git-checkout "Switched to a .. branch" message
294
- - gettextize: git-checkout "HEAD is now at" message
295
- - gettextize: git-checkout describe_detached_head messages
296
- - gettextize: git-checkout: our/their version message
297
- - gettextize: git-checkout basic messages
298
- - gettextize: git-branch "(no branch)" message
299
- - gettextize: git-branch "git branch -v" messages
300
- - gettextize: git-branch "Deleted branch [...]" message
301
- - gettextize: git-branch "remote branch '%s' not found" message
302
- - gettextize: git-branch basic messages
303
- - gettextize: git-add refresh_index message
304
- - gettextize: git-add "remove '%s'" message
305
- - gettextize: git-add "pathspec [...] did not match" message
306
- - gettextize: git-add "Use -f if you really want" message
307
- - gettextize: git-add "no files added" message
308
- - gettextize: git-add basic messages
309
- - gettextize: git-clone "Cloning into" message
310
- - gettextize: git-clone basic messages
311
- - gettext tests: test message re-encoding under C
312
- - po/is.po: add Icelandic translation
313
- - gettext tests: mark a test message as not needing translation
314
- - gettext tests: test re-encoding with a UTF-8 msgid under Shell
315
- - gettext tests: test message re-encoding under Shell
316
- - gettext tests: add detection for is_IS.ISO-8859-1 locale
317
- - gettext tests: test if $VERSION exists before using it
318
- - gettextize: git-init "Initialized [...] repository" message
319
- - gettextize: git-init basic messages
320
- - gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON
321
- - gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter
322
- - gettext.c: use libcharset.h instead of langinfo.h when available
323
- - gettext.c: work around us not using setlocale(LC_CTYPE, "")
324
- - builtin.h: Include gettext.h
325
- - Makefile: use variables and shorter lines for xgettext
326
- - Makefile: tell xgettext(1) that our source is in UTF-8
327
- - Makefile: provide a --msgid-bugs-address to xgettext(1)
328
- - Makefile: A variable for options used by xgettext(1) calls
329
- - gettext tests: locate i18n lib&data correctly under --valgrind
330
- - gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
331
- - gettext tests: rename test to work around GNU gettext bug
332
- - gettext: add infrastructure for translating Git with gettext
333
- - builtin: use builtin.h for all builtin commands
334
- - tests: use test_cmp instead of piping to diff(1)
335
- - t7004-tag.sh: re-arrange git tag comment for clarity
336
-
337
-It is getting ridiculously painful to keep re-resolving the conflicts with
338
-other topics in flight, even with the help with rerere.
339
-
340
-Needs a bit more minor work to get the basic code structure right.
181
+* jh/merge-sans-branch (2011-02-10) 4 commits
182
+ . merge: add support for merging from upstream by default
183
+ - merge: introduce per-branch-configuration helper function
184
+ - merge: introduce setup_merge_commit helper function
185
+ - merge: update the usage information to be more modern
186
342
---------------------------------------------------
343
-[Cooking]
187
+There was an objection to the tip one that determines the upstream in a
188
+wrong way?
189
345
-* jc/rerere-remaining (2011-01-06) 1 commit
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.
197
+
198
+* mz/rerere-remaining (2011-02-16) 2 commits
199
+ - mergetool: don't skip modify/remove conflicts
200
- rerere "remaining"
347
- (this branch is used by mz/rerere-remaining.)
201
349
-Just a handful of weatherballoon patches without proper tests, in response
350
-to feature/minor fix requests.
202
+Looked much better than my weatherbaloon patch. Will merge to 'next'.
203
352
-* pw/p4 (2011-02-05) 8 commits
353
- - git-p4: support clone --bare
354
- - git-p4: decode p4 wildcard characters
355
- - git-p4: better message for "git-p4 sync" when not cloned
356
- - git-p4: reinterpret confusing p4 message
357
- - git-p4: accommodate new move/delete type in p4
358
- - git-p4: add missing newline in initial import message
359
- - git-p4: fix key error for p4 problem
360
- - git-p4: test script
204
+* nd/hash-object-sanity (2011-02-05) 1 commit
205
+ - Make hash-object more robust against malformed objects
206
362
-Will be re-rolled after collecting comments (Petw Wyckoff, 2011-02-07).
207
+Should be low-impact enough. Will merge to 'next'.
208
209
* hv/mingw-fs-funnies (2011-02-07) 5 commits
210
(merged to 'next' on 2011-02-09 at 3d0bb1a)
@@ -395,19 +240,37 @@ Rerolled and seems ready to move forward.
240
+ Convert struct diff_options to use struct pathspec
241
+ diff-no-index: use diff_tree_setup_paths()
242
+ Add struct pathspec
398
- (this branch is used by en/object-list-with-pathspec.)
243
+ (this branch is used by en/object-list-with-pathspec and jc/grep--no-index-pathspec-fix.)
244
245
* en/object-list-with-pathspec (2010-09-20) 2 commits
246
(merged to 'next' on 2011-02-09 at ccf6c6a)
247
+ Add testcases showing how pathspecs are handled with rev-list --objects
248
+ Make rev-list --objects work together with pathspecs
404
- (this branch uses nd/struct-pathspec.)
405
-
406
-* uk/checkout-ambiguous-ref (2011-02-08) 4 commits
407
- - checkout: rearrange update_refs_for_switch for clarity
408
- - checkout: introduce --detach synonym for "git checkout foo^{commit}"
409
- - checkout: split off a function to peel away branchname arg
249
+ (this branch uses nd/struct-pathspec; is tangled with jc/grep--no-index-pathspec-fix.)
250
+
251
+* uk/checkout-ambiguous-ref (2011-02-15) 5 commits
252
+ (merged to 'next' on 2011-02-15 at 645dad6)
253
+ + Rename t2019 with typo "amiguous" that meant "ambiguous"
254
+ + checkout: rearrange update_refs_for_switch for clarity
255
+ + checkout: introduce --detach synonym for "git checkout foo^{commit}"
256
+ + checkout: split off a function to peel away branchname arg
257
(merged to 'next' on 2011-02-03 at 9044724)
258
+ checkout: fix bug with ambiguous refs
259
260
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.