@matheusbsbs / matheus-bagliano / commits / 22430cd286

What's in and cooking 2008-10 #01

Shawn O. Pearce committed Oct 6, 2008 at 09:57 UTC 22430cd286a1c880d5e87c61987bc6015f3cf12e
2 files changed +470
whats/cooking/2008/10/01.txt new
+356
@@ -0,0 +1,356 @@
1 +Subject: What's cooking in git.git (Oct 2008, #01; Mon, 06)
2 +X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed
3 +X-next-at: 395ff9bd88b9cf14617c5e2f461878c4969726f3
4 +
5 +What's cooking in git.git (Oct 2008, #01; Mon, 06)
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 +Topics aren't sorted by name; I have tried to cluster them together
16 +to tell the story of how 'next' and 'pu' have evolved this past week.
17 +
18 +----------------------------------------------------------------
19 +[New Topics]
20 +
21 +* sp/describe-docs (Tue Sep 30 11:55:16 2008 -0700) 1 commit
22 + . docs: Improve the description of describe --tags
23 +
24 +I'm probably going to drop this topic if I can ever get around to
25 +formally writing and posting sp/describe-lwtag for review.
26 +
27 +* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit
28 + - [WIP] Change meaning of --tags and --all
29 +
30 +Modifies "git describe --tags" to allow matching against lightweight
31 +tags even when an annotated tag is found in the history. Its not
32 +in next because I haven't formally written a commit message and
33 +posted the patch for discussion on the list.
34 +
35 +This is a fairly significant change in behavior. Its most certainly
36 +1.6.1 material, but many argue the change is the _correct_ behavior
37 +and the current behavior in 1.6.0 is buggy.
38 +
39 +* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
40 + - diff: add filter for converting binary to text
41 + - diff: introduce diff.<driver>.binary
42 + - diff: unify external diff and funcname parsing code
43 + - t4012: use test_cmp instead of cmp
44 +
45 +A general cleanup on how diff drivers are implemented. Its still
46 +missing documentation updates and tests but doesn't break anything
47 +current as far as I can tell. It needs more review before it can
48 +be slated for 'next'.
49 +
50 +* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit
51 + - Do not rename read-only files during a push
52 +
53 +Supposedly fixes pack file renames on Windows, but it makes the
54 +test suite fail on Linux. I haven't debugged why yet. Its very
55 +likely we need a replacement patch before this can move forward.
56 +
57 +* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit
58 + - format-patch: autonumber by default
59 +
60 +Fails the test suite; some of the test vectors need to be updated
61 +to account for the new default. Someone who cares about this
62 +change should follow through on the test suite update, or this may
63 +get dropped.
64 +
65 +* sh/maint-intrebase (Wed Oct 1 01:11:07 2008 -0500) 1 commit
66 + + Fix interactive rebase on dropped commits.
67 +
68 +This merged to next, then was reverted out this morning, due to
69 +the introduction of the sh/maint-rebase3. Its dead and will be
70 +dropped from the next "What's cooking" release notes.
71 +
72 +* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
73 + - rebase--interactive: fix parent rewriting for dropped commits
74 +
75 +A replacement for sh/maint-intrebase. Its in pu because I have
76 +gotten 3 different versions of this patch, two of them posted a
77 +full 4 days after I merged the first version into next. I felt
78 +burned by the patch author for not keeping up with my tree, so I'm
79 +not merging the patch to next.
80 +
81 +At this point its going to sit in pu until Junio comes back.
82 +I think the topic needs a few more days to settle to see if the
83 +patch author is going to submit any more revisions.
84 +
85 +* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit
86 + + rebase --no-verify
87 +
88 +This adds --no-verify to git rebase, to avoid the pre-rebase hook.
89 +Lacks documentation but otherwise looks sound.
90 +
91 +* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
92 + + builtin-commit: use reduce_heads() only when appropriate
93 +
94 +Fixes "git merge --no-ff --no-commit".
95 +
96 +* dp/cywginstat (Tue Sep 30 17:53:47 2008 +0400) 3 commits
97 + + cygwin: Use native Win32 API for stat
98 + + mingw: move common functionality to win32.h
99 + + add have_git_dir() function
100 +
101 +Performance improvement for Cygwin, bypassing the Cygwin stat
102 +function and using one more like MinGW uses. Probably ready for
103 +master on the next round. Several Cygwin users have given praise
104 +to the series.
105 +
106 +* js/objc-funchdr (Wed Oct 1 00:46:34 2008 +0100) 1 commit
107 + + Teach git diff about Objective-C syntax
108 +
109 +Adds support for Objective-C function headers. I don't use
110 +Objective-C so I can't comment on how good/bad the patterns are
111 +for the language. Feedback (and improvements if necessary) from
112 +Objective-C users would be appreciated.
113 +
114 +* dm/svn-branch (Sat Oct 4 19:35:17 2008 -0700) 1 commit
115 + + Add git-svn branch to allow branch creation in SVN repositories
116 +
117 +Adds "git svn branch" to build branches remotely in SVN.
118 +
119 +Might be ready for master, it has an ACK from Eric. Slated into next
120 +just because I wasn't sure if Junio merges such things immediately
121 +into master or lets them cook for a bit.
122 +
123 +* pb/gitweb (Fri Oct 3 07:41:25 2008 -0700) 7 commits
124 + + Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
125 + + gitweb: Support for simple project search form
126 + + gitweb: Make the by_tag filter delve in forks as well
127 + + gitweb: Support for tag clouds
128 + + gitweb: Add support for extending the action bar with custom links
129 + + gitweb: Sort the list of forks on the summary page by age
130 + + gitweb: Clean-up sorting of project list
131 +
132 +I may have been a bad interm maintainer here by shoving together
133 +two different gitweb series from Pasky. Overall the combined set
134 +looks ready to me.
135 +
136 +* ph/parseopt (Thu Oct 2 14:59:20 2008 +0200) 3 commits
137 + + parse-opt: migrate builtin-merge-file.
138 + + parse-opt: migrate git-merge-base.
139 + + parse-opt: migrate fmt-merge-msg.
140 +
141 +* rz/grepz (Wed Oct 1 18:11:15 2008 +0200) 1 commit
142 + + git grep: Add "-z/--null" option as in GNU's grep.
143 +
144 +* mv/merge-refresh (Fri Oct 3 15:02:31 2008 +0200) 1 commit
145 + + builtin-merge: refresh the index before calling a strategy
146 +
147 +* bc/xdiffnl (Wed Oct 1 14:28:26 2008 -0500) 1 commit
148 + + xdiff-interface.c: strip newline (and cr) from line before pattern
149 + matching
150 +
151 +* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
152 + + rebase: Support preserving merges in non-interactive mode
153 +
154 +These last five all look ready for master, but should cook longer
155 +than just a few days.
156 +
157 +----------------------------------------------------------------
158 +[Old New Topics]
159 +
160 +* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits
161 + + bash completion: Add --[no-]validate to "git send-email"
162 + + send-email: signedoffcc -> signedoffbycc, but handle both
163 + + Docs: send-email: Create logical groupings for man text
164 + + Docs: send-email: Create logical groupings for --help text
165 + + Docs: send-email: Remove unnecessary config variable description
166 + + Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
167 + + send-email: change --no-validate to boolean --[no-]validate
168 + + Docs: send-email: Man page option ordering
169 + + Docs: send-email usage text much sexier
170 + + Docs: send-email's usage text and man page mention same options
171 +
172 +This series looks pretty good to me. It probably can merge to
173 +master on the next "What's cooking" cycle.
174 +
175 +----------------------------------------------------------------
176 +[Dropped Topics]
177 +
178 +* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
179 + + merge: remove deprecated summary and diffstat options and config
180 + variables
181 +
182 +This has been reverted from next and is being dropped. Its too
183 +soon to remove a feature that was just added in 1.5.6 timeframe.
184 +Perhaps in 1.7.0 this can be revisited.
185 +
186 +----------------------------------------------------------------
187 +[Stuck Topics]
188 +
189 +* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
190 + - grep: skip files outside sparse checkout area
191 + - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
192 + - Prevent diff machinery from examining worktree outside sparse
193 + checkout
194 + - ls-files: Add tests for --sparse and friends
195 + - update-index: add --checkout/--no-checkout to update
196 + CE_NO_CHECKOUT bit
197 + - update-index: refactor mark_valid() in preparation for new options
198 + - ls-files: add options to support sparse checkout
199 + - Introduce CE_NO_CHECKOUT bit
200 + - Extend index to save more flags
201 +
202 +Recently updated with a repost. I've been too swamped at day-job
203 +to actively review the series. There has been some discussion on
204 +list about it so its not stalled, but it needs more eyeballs.
205 +
206 +* gb/gitweb-pathinfo (Thu Oct 2 02:10:34 2008 +0200) 6 commits
207 + - gitweb: generate parent..current URLs
208 + - gitweb: parse parent..current syntax from pathinfo
209 + - gitweb: use_pathinfo filenames start with /
210 + - gitweb: generate project/action/hash URLs
211 + - gitweb: refactor input parameters parse/validation
212 + - gitweb: parse project/action/hash_base:filename PATH_INFO
213 +
214 +Still going through revisions on the git ML. Its great work and
215 +is heading in the right direction. But the discussion and patch
216 +generation rate is too high to merge the topic into next just yet.
217 +
218 +So its waiting for a re-roll of the series once discussion settles
219 +down and there is a final patch series available.
220 +
221 +----------------------------------------------------------------
222 +[Stalled -- Needs Action to Proceed (or to be dropped)]
223 +
224 +* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
225 + - t7400: Add short "git submodule add" testsuite
226 +
227 +Still waiting for a reroll. Should be dropped next week if we
228 +don't get one during this coming week.
229 +
230 +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
231 + - Use xdiff caching to improve git blame performance
232 + - Allow xdiff machinery to cache hash results for a file
233 + - Always initialize xpparam_t to 0
234 + - Bypass textual patch generation and parsing in git blame
235 + - Allow alternate "low-level" emit function from xdl_diff
236 +
237 +(jc: Réne had good comments on how the callback should be
238 + structured.)
239 +
240 +* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
241 + - git-am: Pass the --directory option through to git-apply
242 +
243 +(jc: I think this is still buggy and drops the option when am stops
244 + with conflicts.)
245 +
246 +All three of these are stalled. I'm not going to drop them just
247 +yet, but Junio's comments still hold. If there's no action on
248 +these next week we may seem them drop off.
249 +
250 +----------------------------------------------------------------
251 +[Will be merged to 'master/maint' soon]
252 +
253 +* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
254 + + git-add --intent-to-add (-N)
255 +
256 +Teaches "git add" to record only the intent to add a path later.
257 +(jc: I rerolled this without the fake empty blob object.)
258 +
259 +* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
260 + + make prune report removed objects on -v
261 +
262 +This is a pretty trivial new feature.
263 +
264 +* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
265 + + tutorial: update output of git commit
266 + + reformat informational commit message
267 + + git commit: Reformat output somewhat
268 + + builtin-commit.c: show on which branch a commit was added
269 +
270 +I think this topic is settled for now.
271 +
272 +* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit
273 + + Makefile: do not set NEEDS_LIBICONV for Solaris 8
274 +
275 +* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits
276 + + rebase -i: remove leftover debugging
277 + + rebase -i: proper prepare-commit-msg hook argument when squashing
278 +
279 +* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit
280 + + git-stash.sh: fix flawed fix of invalid ref handling (commit
281 + da65e7c1)
282 +
283 +The latter three are ready for 'maint'. I felt burned by a bad
284 +commit into made directly into maint earlier in the week so these
285 +wound up getting queued into 'next' first, even though they are
286 +certainly maint material.
287 +
288 +----------------------------------------------------------------
289 +[Actively Cooking]
290 +
291 +* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
292 + + Documentation: Refer to git-rebase(1) to warn against rewriting
293 + + Documentation: new upstream rebase recovery section in git-rebase
294 +
295 +(jc: My impression from the last round of discusson on the third
296 + patch in this series (not queued here) was that as long as we
297 + do not present it as "One True Workflow", the description was
298 + a good starting point, possibly others to add other recommended
299 + flows later.)
300 +
301 +I haven't looked at this series yet. Based on Junio's remarks above
302 +I'm looking for more input on this series before it goes anywhere.
303 +
304 +* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
305 + + date/time: do not get confused by fractional seconds
306 +
307 +I need to look at this in more detail. I suspect we can merge
308 +this to master soon, but its been kicking around since Aug 16th.
309 +I need to look at it to see if there's any obvious reason why Junio
310 +has no notes on this branch and why it hasn't merged yet.
311 +
312 +----------------------------------------------------------------
313 +[On Hold]
314 +
315 +* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
316 + - revision --simplify-merges: incremental simplification
317 + - revision --simplify-merges: prepare for incremental simplification
318 +
319 +(jc: I started making this incremental but the progress is not
320 + so great.)
321 +
322 +* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
323 + - git-am --forge: add Signed-off-by: line for the author
324 + - git-am: clean-up Signed-off-by: lines
325 + - stripspace: add --log-clean option to clean up signed-off-by:
326 + lines
327 + - stripspace: use parse_options()
328 + - Add "git am -s" test
329 + - git-am: refactor code to add signed-off-by line for the committer
330 +
331 +(jc: The one at second from the tip needs reworking.)
332 +
333 +* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
334 + - "git push": tellme-more protocol extension
335 +
336 +This is a great idea, but IIRC its implementation has a deadlock
337 +during communication between the peers. Someone needs to pick up
338 +this topic and resolve the deadlock before it can continue.
339 +
340 +* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
341 + - blame: show "previous" information in --porcelain/--incremental
342 + format
343 + - git-blame: refactor code to emit "porcelain format" output
344 +
345 +* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
346 + . WIP: start teaching the --whitespace=fix to merge machinery
347 +
348 +This has a merge conflict with `next` and isn't even in pu right now.
349 +
350 +* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
351 + - diff: enable "too large a rename" warning when -M/-C is explicitly
352 + asked for
353 +
354 +(jc: This would be the right thing to do for command line use,
355 + but gitk will be hit due to tcl/tk's limitation, so I am holding
356 + this back for now.)
whats/in/2008/10/01.txt new
+114
@@ -0,0 +1,114 @@
1 +Subject: What's in git.git (Oct 2008, #01; Mon, 06)
2 +X-maint-at: e261cf94848d31868c21fb11cade51c30dfcdbe7
3 +X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed
4 +X-maint-was: edb7e82f72106add9f2fbaf9d99d9532a72e3f91
5 +X-master-was: 9800c0df412869c7949935b61581b9361fc49bd1
6 +
7 +What's in git.git (Oct 2008, #01; Mon, 06)
8 +
9 + maint e261cf9 (Update release notes for 1.6.0.3)
10 + master 276328f (Merge branch 'maint')
11 +------------------------------------------------------------------------
12 +
13 +Junio should be returning from vacation this week. I will keep
14 +updating my git/spearce.git tree until he gets back and asks for
15 +my current topic heads.
16 +
17 +Once Junio gets back I think we need to focus on getting 1.6.0.3
18 +out the door. We have 77 commits queued up since 1.6.0.2 and it
19 +has been almost 4 weeks since our last maint release.
20 +
21 +So please, test, test, test maint.
22 +
23 +--------
24 +
25 +* The 'maint' branch has these fixes since the last announcement.
26 +
27 +Alexander Gavrilov (1):
28 + builtin-blame: Fix blame -C -C with submodules.
29 +
30 +David Soria Parra (1):
31 + Solaris: Use OLD_ICONV to avoid compile warnings
32 +
33 +Dmitry Potapov (2):
34 + make prefix_path() never return NULL
35 + do not segfault if make_cache_entry failed
36 +
37 +Giuseppe Bilotta (1):
38 + gitweb: remove PATH_INFO from $my_url and $my_uri
39 +
40 +Jakub Narebski (2):
41 + gitweb: Fix two 'uninitialized value' warnings in git_tree()
42 + gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh
43 +
44 +Linus Torvalds (1):
45 + fix bogus "diff --git" header from "diff --no-index"
46 +
47 +Luc Heinrich (1):
48 + git-svn: call 'fatal' correctly in set-tree
49 +
50 +Michael Prokop (1):
51 + Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
52 +
53 +Nanako Shiraishi (2):
54 + docs: describe pre-rebase hook
55 + Teach rebase -i to honor pre-rebase hook
56 +
57 +SZEDER Gábor (3):
58 + t0024: add executable permission
59 + Documentation: remove '\' in front of short options
60 + bash: remove fetch, push, pull dashed form leftovers
61 +
62 +Shawn O. Pearce (1):
63 + Update release notes for 1.6.0.3
64 +
65 +Tuncer Ayaz (1):
66 + Fix fetch/clone --quiet when stdout is connected
67 +
68 +martin f. krafft (1):
69 + Improve git-log documentation wrt file filters
70 +
71 +
72 +* The 'master' branch has these since the last announcement
73 + in addition to the above.
74 +
75 +Brandon Casey (1):
76 + diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785
77 +
78 +David Aguilar (1):
79 + tests: add a testcase for "git submodule sync"
80 +
81 +David Bryson (1):
82 + Use "git_config_string" to simplify "builtin-gc.c" code where
83 + "prune_expire" is set
84 +
85 +Dmitry Potapov (1):
86 + do not segfault if make_cache_entry failed
87 +
88 +Jeff King (1):
89 + tests: grep portability fixes
90 +
91 +Jonathan del Strother (1):
92 + Add OS X support to the pre-auto-gc example hook
93 +
94 +Nanako Shiraishi (5):
95 + dir.c: make dir_add_name() and dir_add_ignored() static
96 + run-command.c: remove run_command_v_opt_cd()
97 + config.c: make git_parse_long() static
98 + commit.c: make read_graft_file() static
99 + archive.c: make archiver static
100 +
101 +Nicolas Pitre (1):
102 + fix openssl headers conflicting with custom SHA1 implementations
103 +
104 +Petr Baudis (3):
105 + gitweb: Quote non-displayable characters in hex, not octal
106 + config.c: Tolerate UTF8 BOM at the beginning of config file
107 + gitweb: Identify all summary metadata table rows
108 +
109 +Ralf Wildenhues (1):
110 + Correct typos in RelNotes-1.6.1
111 +
112 +SZEDER Gábor (1):
113 + remove vim syntax highlighting in favor of upstream
114 +