What's in/cooking
Junio C Hamano committed
Oct 22, 2008 at 22:37 UTC
cfd1dae56c9449948650e73918bda4e3efd61ad8
2 files changed
+378
whats/cooking/2008/10/05.txt
new
+247
@@ -0,0 +1,247 @@
1
+Subject: What's cooking in git.git (Oct 2008, #05; Wed, 22)
2
+X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0
3
+X-next-at: 6ea41095c3a924d4f7d4e9d3f61fb472507612c8
4
+
5
+What's cooking in git.git (Oct 2008, #05; Wed, 22)
6
+--------------------------------------------------
7
+
8
+Here are the topics that have been cooking. Commits prefixed
9
+with '-' are only in 'pu' while commits prefixed with '+' are
10
+in 'next'.
11
+
12
+The topics list the commits in reverse chronological order. The topics
13
+meant to be merged to the maintenance series have "maint-" in their names.
14
+
15
+----------------------------------------------------------------
16
+[New Topics]
17
+
18
+* cj/maint-gitpm-fix-maybe-self (Sat Oct 18 20:25:12 2008 +0200) 1 commit
19
+ + Git.pm: do not break inheritance
20
+
21
+Looked Ok; will be in 'master' soon.
22
+
23
+* gb/gitweb-pathinfo (Tue Oct 21 21:34:54 2008 +0200) 5 commits
24
+ - gitweb: generate parent..current URLs
25
+ - gitweb: parse parent..current syntax from PATH_INFO
26
+ - gitweb: use_pathinfo filenames start with /
27
+ - gitweb: generate project/action/hash URLs
28
+ - gitweb: parse project/action/hash_base:filename PATH_INFO
29
+
30
+Seventh iteration; hopefully the usual gitweb gangs will give quick
31
+comments and ack to push this out to 'next' soon.
32
+
33
+* ag/blame-encoding (Wed Oct 22 00:55:57 2008 +0400) 1 commit
34
+ + builtin-blame: Reencode commit messages according to git-log
35
+ rules.
36
+
37
+Looked Ok; will be in 'master' soon.
38
+
39
+* mv/parseopt-checkout-index (Sat Oct 18 03:17:23 2008 +0200) 1 commit
40
+ + parse-opt: migrate builtin-checkout-index.
41
+
42
+Looked Ok; will be in 'master' soon.
43
+
44
+----------------------------------------------------------------
45
+[Graduated to "master"]
46
+
47
+* rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits
48
+ + make alloc_ref_from_str() the new alloc_ref()
49
+ + use alloc_ref_from_str() everywhere
50
+ + add alloc_ref_with_prefix()
51
+
52
+* jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit
53
+ + reset --hard/read-tree --reset -u: remove unmerged new paths
54
+
55
+Teaches "reset --hard" to remove new paths in conflict.
56
+
57
+* jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits
58
+ + Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
59
+ + refactor handling of "other" files in ls-files and status
60
+
61
+* jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits
62
+ + Fix checkout not to clobber the branch when using symlinked HEAD
63
+ upon detaching
64
+ + Enhance hold_lock_file_for_{update,append}() API
65
+ + demonstrate breakage of detached checkout with symbolic link HEAD
66
+ + Fix "checkout --track -b newbranch" on detached HEAD
67
+
68
+* jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit
69
+ + refactor handling of "other" files in ls-files and status
70
+
71
+* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
72
+ + tutorial: update output of git commit
73
+ + reformat informational commit message
74
+ + git commit: Reformat output somewhat
75
+ + builtin-commit.c: show on which branch a commit was added
76
+
77
+* js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits
78
+ + pull: allow "git pull origin $something:$current_branch" into an
79
+ unborn branch
80
+ + Fix fetch/pull when run without --update-head-ok
81
+
82
+* ns/rebase-noverify (Tue Oct 14 08:17:16 2008 +0900) 2 commits
83
+ + rebase: Document --no-verify option to bypass pre-rebase hook
84
+ + rebase --no-verify
85
+
86
+This adds --no-verify to git rebase, to avoid the pre-rebase hook.
87
+
88
+* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
89
+ + builtin-commit: use reduce_heads() only when appropriate
90
+
91
+Fixes "git merge --no-ff --no-commit".
92
+
93
+* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
94
+ + rebase: Support preserving merges in non-interactive mode
95
+
96
+* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit
97
+ + Do not rename read-only files during a push
98
+
99
+Fixes pack file renames on Windows.
100
+
101
+* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit
102
+ + describe: Make --tags and --all match lightweight tags more often
103
+
104
+When the user gives --tags, the request is asking to treat lightweight and
105
+annotated tags at equal weight, and if lightweight ones are closer, they
106
+should be used.
107
+
108
+* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit
109
+ + format-patch: autonumber by default
110
+
111
+* dp/checkattr (Wed Oct 15 09:11:52 2008 +0200) 3 commits
112
+ + git-check-attr(1): use 'verse' for multi-line synopsis sections
113
+ + check-attr: Add --stdin option
114
+ + check-attr: add an internal check_attr() function
115
+
116
+Batch attr lookup via --stdin, for gitk and git-gui.
117
+
118
+* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit
119
+ + gitweb: refactor input parameters parse/validation
120
+
121
+A major cleanup on the way gitweb parses its input arguments.
122
+Future gitweb patches to add more arguments into the PATH_INFO
123
+depend upon this initial cleanup work.
124
+
125
+* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit
126
+ + compat/cygwin.c - Use cygwin's stat if core.filemode == true
127
+
128
+* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit
129
+ + Implement git clone -v
130
+
131
+Does what it says it does. This may be ready for master soon,
132
+its a pretty trivial change.
133
+
134
+* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
135
+ + Documentation: Refer to git-rebase(1) to warn against rewriting
136
+ + Documentation: new upstream rebase recovery section in git-rebase
137
+
138
+Also the workflow document itself is now in 'master'.
139
+
140
+* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
141
+ + rebase--interactive: fix parent rewriting for dropped commits
142
+
143
+* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
144
+ + diff: add filter for converting binary to text
145
+ + diff: introduce diff.<driver>.binary
146
+ + diff: unify external diff and funcname parsing code
147
+ + t4012: use test_cmp instead of cmp
148
+
149
+A general cleanup on how diff drivers are implemented. Its still
150
+missing documentation updates and tests but doesn't break anything
151
+current as far as I can tell.
152
+
153
+----------------------------------------------------------------
154
+[Stalled]
155
+
156
+* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
157
+ - grep: skip files outside sparse checkout area
158
+ - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
159
+ - Prevent diff machinery from examining worktree outside sparse
160
+ checkout
161
+ - ls-files: Add tests for --sparse and friends
162
+ - update-index: add --checkout/--no-checkout to update
163
+ CE_NO_CHECKOUT bit
164
+ - update-index: refactor mark_valid() in preparation for new options
165
+ - ls-files: add options to support sparse checkout
166
+ - Introduce CE_NO_CHECKOUT bit
167
+ - Extend index to save more flags
168
+
169
+Needs review.
170
+
171
+* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
172
+ - Use xdiff caching to improve git blame performance
173
+ - Allow xdiff machinery to cache hash results for a file
174
+ - Always initialize xpparam_t to 0
175
+ - Bypass textual patch generation and parsing in git blame
176
+ - Allow alternate "low-level" emit function from xdl_diff
177
+
178
+Réne had good comments on how the callback should be structured.
179
+Waiting for a reroll.
180
+
181
+* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
182
+ - gitweb: Better processing format string in custom links in navbar
183
+
184
+Waiting for some sort of response from Pasky.
185
+
186
+* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit
187
+ + Fix reading of cloud tags
188
+
189
+Request-for-review-and-ack sent; waiting for response.
190
+
191
+----------------------------------------------------------------
192
+[Actively Cooking]
193
+
194
+* np/index-pack (Wed Oct 22 20:59:22 2008 -0400) 4 commits
195
+ - improve index-pack tests
196
+ + fix multiple issues in index-pack
197
+ + index-pack: smarter memory usage during delta resolution
198
+ + index-pack: rationalize delta resolution code
199
+
200
+The buglets that caused people on 'next' some surprises are quickly
201
+killed. Thanks.
202
+
203
+* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits
204
+ + git-rebase--interactive.sh: comparision with == is bashism
205
+ + rebase-i-p: minimum fix to obvious issues
206
+ + rebase-i-p: if todo was reordered use HEAD as the rewritten parent
207
+ + rebase-i-p: do not include non-first-parent commits touching
208
+ UPSTREAM
209
+ + rebase-i-p: only list commits that require rewriting in todo
210
+ + rebase-i-p: fix 'no squashing merges' tripping up non-merges
211
+ + rebase-i-p: delay saving current-commit to REWRITTEN if squashing
212
+ + rebase-i-p: use HEAD for updating the ref instead of mapping
213
+ OLDHEAD
214
+ + rebase-i-p: test to exclude commits from todo based on its parents
215
+
216
+Changes the `rebase -i -p` behavior to behave like git sequencer's
217
+rewrite of `rebase -i` would behave.
218
+
219
+----------------------------------------------------------------
220
+[On Hold]
221
+
222
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
223
+ - revision --simplify-merges: incremental simplification
224
+ - revision --simplify-merges: prepare for incremental simplification
225
+
226
+I started making this incremental but the progress is not
227
+so great.
228
+
229
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
230
+ - "git push": tellme-more protocol extension
231
+
232
+This seems to have a deadlock during communication between the peers.
233
+Someone needs to pick up this topic and resolve the deadlock before it can
234
+continue.
235
+
236
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
237
+ - blame: show "previous" information in --porcelain/--incremental
238
+ format
239
+ - git-blame: refactor code to emit "porcelain format" output
240
+
241
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
242
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
243
+ asked for
244
+
245
+This would be the right thing to do for command line use,
246
+but gitk will be hit due to tcl/tk's limitation, so I am holding
247
+this back for now.
whats/in/2008/10/05.txt
new
+131
@@ -0,0 +1,131 @@
1
+Subject: What's in git.git (Oct 2008, #05; Wed, 22)
2
+X-maint-at: 031e6c898f61db1ae0c0be641eac6532c1000d56
3
+X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0
4
+X-maint-was: f430c8e44d0548e844d817fc32be7c38b2b6856c
5
+X-master-was: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344
6
+
7
+What's in git.git (Oct 2008, #05; Wed, 22)
8
+
9
+ maint 031e6c8 (GIT 1.6.0.3)
10
+ master 759ad19 (submodule: fix some non-portable grep invocations)
11
+------------------------------------------------------------------------
12
+
13
+BLURB HERE
14
+
15
+* The 'maint' branch has these fixes since the last announcement.
16
+
17
+Abhijit Bhopatkar (1):
18
+ Documentation: Clarify '--signoff' for git-commit
19
+
20
+Junio C Hamano (2):
21
+ Fix testcase failure when extended attributes are in use
22
+ GIT 1.6.0.3
23
+
24
+Nicolas Pitre (1):
25
+ rehabilitate 'git index-pack' inside the object store
26
+
27
+
28
+* The 'master' branch has these since the last announcement
29
+ in addition to the above.
30
+
31
+Alexander Gavrilov (3):
32
+ gitk: Fix a bug in collapsing deeply nested trees
33
+ gitk: Enhance file encoding support
34
+ gitk: Implement batch lookup and caching of encoding attrs
35
+
36
+Andreas Ericsson (1):
37
+ rebase: Support preserving merges in non-interactive mode
38
+
39
+Brian Gernhardt (1):
40
+ format-patch: autonumber by default
41
+
42
+Christian Stimming (1):
43
+ gitk: Add untranslated error messages to translation
44
+
45
+Dmitry Potapov (2):
46
+ check-attr: add an internal check_attr() function
47
+ check-attr: Add --stdin option
48
+
49
+Fredrik Skolmli (1):
50
+ Documentation: Spelling fix
51
+
52
+Giuseppe Bilotta (1):
53
+ gitweb: refactor input parameters parse/validation
54
+
55
+Jeff King (8):
56
+ refactor handling of "other" files in ls-files and status
57
+ t4012: use test_cmp instead of cmp
58
+ diff: unify external diff and funcname parsing code
59
+ diff: introduce diff.<driver>.binary
60
+ diff: add filter for converting binary to text
61
+ document "intent to add" option to git-add
62
+ rm: loosen safety valve for empty files
63
+ submodule: fix some non-portable grep invocations
64
+
65
+Johannes Schindelin (1):
66
+ Fix fetch/pull when run without --update-head-ok
67
+
68
+Johannes Sixt (1):
69
+ git-remote: list branches in vertical lists
70
+
71
+Jonas Fonseca (1):
72
+ git-check-attr(1): use 'verse' for multi-line synopsis sections
73
+
74
+Junio C Hamano (6):
75
+ pull: allow "git pull origin $something:$current_branch" into an unborn
76
+ branch
77
+ Fix "checkout --track -b newbranch" on detached HEAD
78
+ reset --hard/read-tree --reset -u: remove unmerged new paths
79
+ demonstrate breakage of detached checkout with symbolic link HEAD
80
+ Enhance hold_lock_file_for_{update,append}() API
81
+ Fix mismerge at cdb22c4 in builtin-checkout.c
82
+
83
+Lee Marlow (2):
84
+ bash completion: Add 'workflows' to 'git help'
85
+ workflows documentation: fix link to git-request-pull[1]
86
+
87
+Mark Levedahl (1):
88
+ compat/cygwin.c - Use cygwin's stat if core.filemode == true
89
+
90
+Matt McCutchen (1):
91
+ git-merge-recursive: honor merge.conflictstyle once again
92
+
93
+Miklos Vajna (2):
94
+ builtin-commit: use reduce_heads() only when appropriate
95
+ Implement git clone -v
96
+
97
+Nanako Shiraishi (2):
98
+ rebase --no-verify
99
+ rebase: Document --no-verify option to bypass pre-rebase hook
100
+
101
+Paul Mackerras (6):
102
+ gitk: Use <Button-2> for context menus on OSX
103
+ gitk: Clean up file encoding code and add enable/disable option
104
+ gitk: Fix binding for <Return> in sha1 entry field
105
+ gitk: New way of constructing menus that allows for Alt+letter
106
+ accelerators
107
+ gitk: Regenerate .po files
108
+ gitk: Turn short SHA1 names into links too
109
+
110
+Petr Baudis (1):
111
+ Do not rename read-only files during a push
112
+
113
+René Scharfe (3):
114
+ add alloc_ref_with_prefix()
115
+ use alloc_ref_from_str() everywhere
116
+ make alloc_ref_from_str() the new alloc_ref()
117
+
118
+Richard Quirk (1):
119
+ gitk: Bind Key-Return to create on new branch dialog
120
+
121
+Shawn O. Pearce (1):
122
+ describe: Make --tags and --all match lightweight tags more often
123
+
124
+Stephen Haberman (1):
125
+ rebase--interactive: fix parent rewriting for dropped commits
126
+
127
+Thomas Rast (3):
128
+ Documentation: new upstream rebase recovery section in git-rebase
129
+ Documentation: Refer to git-rebase(1) to warn against rewriting
130
+ Documentation: add manpage about workflows
131
+