What's cooking (2008/09 #01)
Junio C Hamano committed
Sep 6, 2008 at 20:44 UTC
ed09c5452915933fdc4d2c69172a8213f6493290
1 file changed
+163
-83
whats-cooking.txt
+163
-83
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Aug 2008, #09; Sun, 31)
2
-X-master-at: 7f314565fe20e324e8db1a7c233e43ca4e3683f0
3
-X-next-at: 007e493846da7bb03b026e90ac0af8bdea9d0d0c
1
+Subject: What's cooking in git.git (Sep 2008, #01; Sat, 06)
2
+X-master-at: ec3a4ba519c0012d58584d23f407c302e7b80eb6
3
+X-next-at: d2470dbfc97c972e54913e3d3c622118526c9cc2
4
5
-What's cooking in git.git (Aug 2008, #09; Sun, 31)
5
+What's cooking in git.git (Sep 2008, #01; Sat, 06)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -15,14 +15,42 @@ meant to be merged to the maintenance series have "maint-" in their names.
15
----------------------------------------------------------------
16
[New Topics]
17
18
-Most of them are expected to spend only short amount of time on 'next'
19
-before graduating to 'master'.
18
+* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
19
+ + t5300: improve SHA1 collision test
20
+ + pack-objects: don't include missing preferred base objects
21
+ + sha1write: don't copy full sized buffers
22
+ + Merge branch 'np/maint-safer-pack' into np/pack
23
21
-* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
22
- + checkout: do not check out unmerged higher stages randomly
24
+* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
25
+ + diff --dirstat-by-file: count changed files, not lines
26
24
-* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
25
- - git-am: Pass the --directory option through to git-apply
27
+* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
28
+ - for-each-ref: `:short` format for `refname`
29
+
30
+* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
31
+ + safe_create_leading_directories(): make it about "leading"
32
+ directories
33
+
34
+* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
35
+ + daemon.c: avoid setlinebuf()
36
+
37
+* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
38
+ + diff --quiet: make it synonym to --exit-code >/dev/null
39
+ + diff Porcelain: do not disable auto index refreshing on -C -C
40
+
41
+* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
42
+ - git-apply:--include=pathspec
43
+
44
+* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
45
+ + add '%d' pretty format specifier to show decoration
46
+ + move load_ref_decorations() to log-tree.c and export it
47
+ + log: add load_ref_decorations()
48
+
49
+* pb/commit-where (Fri Sep 5 19:13:05 2008 +0200) 1 commit
50
+ - Builtin-commit: show on which branch a commit was added
51
+
52
+----------------------------------------------------------------
53
+[Graduated to "master"]
54
55
* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
56
+ fixup_pack_header_footer(): use nicely aligned buffer sizes
@@ -31,44 +59,9 @@ before graduating to 'master'.
59
+ improve reliability of fixup_pack_header_footer()
60
+ pack-objects: improve returned information from write_one()
61
34
-* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
35
- + diff: Help "less" hide ^M from the output
36
-
37
-* jc/better-conflict-resolution (Sun Aug 31 20:36:32 2008 -0700) 15 commits
38
- . git-merge documentation: describe how conflict is presented
39
- . checkout --conflict=<style>: recreate merge in a non-default style
40
- + checkout -m: recreate merge when checking out of unmerged index
41
- + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
42
- resolution'
43
- + git-merge-recursive: learn to honor merge.conflictstyle
44
- + merge.conflictstyle: choose between "merge" and "diff3 -m" styles
45
- + rerere: understand "diff3 -m" style conflicts with the original
46
- + rerere.c: use symbolic constants to keep track of parsing states
47
- + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
48
- less
49
- + xmerge.c: minimum readability fixups
50
- + xdiff-merge: optionally show conflicts in "diff3 -m" style
51
- + xdl_fill_merge_buffer(): separate out a too deeply nested function
52
- + checkout --ours/--theirs: allow checking out one side of a
53
- conflicting merge
54
- + checkout -f: allow ignoring unmerged paths when checking out of
55
- the index
56
- + checkout: do not check out unmerged higher stages randomly
57
-
58
-* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 5 commits
59
- + t6013: replace use of 'tac' with equivalent Perl
60
- + rev-list: fix --reverse interaction with --parents
61
- + Topo-sort before --simplify-merges
62
- + revision traversal: show full history with merge simplification
63
- + revision.c: whitespace fix
64
-
62
* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
63
+ builtin-help: fallback to GIT_MAN_VIEWER before man
64
68
-* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
69
- + Add help.autocorrect to enable/disable autocorrecting
70
- + git wrapper: DWIM mistyped commands
71
-
65
* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
66
+ 'git foo' program identifies itself without dash in die() messages
67
+ Start conforming code to "git subcmd" style
@@ -88,28 +81,6 @@ before graduating to 'master'.
81
82
The last two fail test suite.
83
91
-----------------------------------------------------------------
92
-[Stalled -- Needs Action to Proceed (or to be dropped)]
93
-
94
-* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
95
- - Use xdiff caching to improve git blame performance
96
- - Allow xdiff machinery to cache hash results for a file
97
- - Always initialize xpparam_t to 0
98
- - Bypass textual patch generation and parsing in git blame
99
- - Allow alternate "low-level" emit function from xdl_diff
100
-
101
-Réne had good comments on how the callback should be structured.
102
-
103
-* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
104
- - configure: auto detect dynamic library path switches
105
- - Makefile: Allow CC_LD_DYNPATH to be overriden
106
-
107
-Needs success reports from people who do use user-defined dynamic library
108
-path when they build their "git" before this series can go anywhere.
109
-
110
-----------------------------------------------------------------
111
-[Will be merged to "master" soon]
112
-
84
* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
85
+ Merge branch 'tr/rev-list-docs' into tr/filter-branch
86
+ Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
@@ -132,9 +103,74 @@ This now merges up all (and only) the necessary pieces from the
103
post-simplify topic and the documentation updates, ready to be merged to
104
"master".
105
106
+----------------------------------------------------------------
107
+[Stalled -- Needs Action to Proceed (or to be dropped)]
108
+
109
+* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
110
+ - Use xdiff caching to improve git blame performance
111
+ - Allow xdiff machinery to cache hash results for a file
112
+ - Always initialize xpparam_t to 0
113
+ - Bypass textual patch generation and parsing in git blame
114
+ - Allow alternate "low-level" emit function from xdl_diff
115
+
116
+Réne had good comments on how the callback should be structured.
117
+
118
+* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
119
+ - git-am: Pass the --directory option through to git-apply
120
+
121
+----------------------------------------------------------------
122
+[Will be merged to "master" soon]
123
+
124
+* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
125
+ + diff: Help "less" hide ^M from the output
126
+
127
+* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
128
+ + checkout: do not check out unmerged higher stages randomly
129
+
130
+This is the same one as the bottom of "better conflict resolution" series;
131
+it is a bugfix meant to be applied on 'maint'.
132
+
133
+* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
134
+ + configure: auto detect dynamic library path switches
135
+ + Makefile: Allow CC_LD_DYNPATH to be overriden
136
+
137
+I decided to push this forward; it might break minority configurations,
138
+but it appears nobody pays attention until it actually hurts, so let's see
139
+what happens when this hits 'master'.
140
+
141
+* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
142
+ + Add help.autocorrect to enable/disable autocorrecting
143
+ + git wrapper: DWIM mistyped commands
144
+
145
----------------------------------------------------------------
146
[Actively Cooking]
147
148
+* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
149
+ + t6013: replace use of 'tac' with equivalent Perl
150
+ + rev-list: fix --reverse interaction with --parents
151
+
152
+* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 16 commits
153
+ + Fix AsciiDoc errors in merge documentation
154
+ + git-merge documentation: describe how conflict is presented
155
+ + checkout --conflict=<style>: recreate merge in a non-default style
156
+ + checkout -m: recreate merge when checking out of unmerged index
157
+ + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
158
+ resolution'
159
+ + git-merge-recursive: learn to honor merge.conflictstyle
160
+ + merge.conflictstyle: choose between "merge" and "diff3 -m" styles
161
+ + rerere: understand "diff3 -m" style conflicts with the original
162
+ + rerere.c: use symbolic constants to keep track of parsing states
163
+ + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
164
+ less
165
+ + xmerge.c: minimum readability fixups
166
+ + xdiff-merge: optionally show conflicts in "diff3 -m" style
167
+ + xdl_fill_merge_buffer(): separate out a too deeply nested function
168
+ + checkout --ours/--theirs: allow checking out one side of a
169
+ conflicting merge
170
+ + checkout -f: allow ignoring unmerged paths when checking out of
171
+ the index
172
+ + checkout: do not check out unmerged higher stages randomly
173
+
174
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
175
+ date/time: do not get confused by fractional seconds
176
@@ -154,15 +190,25 @@ case insensitive filesystems. I dunno.
190
Teaches "git add" to record only the intent to add a path later.
191
I rerolled this without the fake empty blob object.
192
157
-* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
193
+* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
194
+ + bisect: remove "checkout_done" variable used when checking merge
195
+ bases
196
+ bisect: only check merge bases when needed
197
+ bisect: test merge base if good rev is not an ancestor of bad rev
198
161
-* mv/merge-recursive (Thu Aug 28 15:43:00 2008 +0200) 4 commits
162
- - builtin-merge: avoid run_command_v_opt() for recursive and subtree
163
- - merge-recursive: introduce merge_options
164
- - merge-recursive.c: Add more generic merge_recursive_generic()
165
- - Split out merge_recursive() to merge-recursive.c
199
+* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
200
+ + builtin-merge: release the lockfile in try_merge_strategy()
201
+ + merge-recursive: get rid of virtual_id
202
+ + merge-recursive: move current_{file,directory}_set to struct
203
+ merge_options
204
+ + merge-recursive: move the global obuf to struct merge_options
205
+ + merge-recursive: get rid of the index_only global variable
206
+ + merge-recursive: move call_depth to struct merge_options
207
+ + cherry-pick/revert: make direct internal call to merge_tree()
208
+ + builtin-merge: avoid run_command_v_opt() for recursive and subtree
209
+ + merge-recursive: introduce merge_options
210
+ + merge-recursive.c: Add more generic merge_recursive_generic()
211
+ + Split out merge_recursive() to merge-recursive.c
212
213
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
214
+ diff: vary default prefix depending on what are compared
@@ -228,15 +274,49 @@ hit due to tcl/tk's limitation, so I am holding this back for now.
274
----------------------------------------------------------------
275
[Graduated to "master"]
276
231
-* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit
232
- + git-p4: Fix checkout bug when using --import-local.
277
+* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
278
+ + fixup_pack_header_footer(): use nicely aligned buffer sizes
279
+ + index-pack: use fixup_pack_header_footer()'s validation mode
280
+ + pack-objects: use fixup_pack_header_footer()'s validation mode
281
+ + improve reliability of fixup_pack_header_footer()
282
+ + pack-objects: improve returned information from write_one()
283
+
284
+* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
285
+ + builtin-help: fallback to GIT_MAN_VIEWER before man
286
+
287
+* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
288
+ + 'git foo' program identifies itself without dash in die() messages
289
+ + Start conforming code to "git subcmd" style
290
+
291
+* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit
292
+ + git commit --author=$name: look $name up in existing commits
293
234
-* sb/daemon (Sun Aug 24 13:27:10 2008 -0700) 5 commits
235
- + daemon.c: minor style fixup
236
- + git-daemon: rewrite kindergarden, new option --max-connections
237
- + git-daemon: Simplify dead-children reaping logic
238
- + git-daemon: use LOG_PID, simplify logging code
239
- + git-daemon: call logerror() instead of error()
294
+* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit
295
+ + cast pid_t's to uintmax_t to improve portability
296
+
297
+* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits
298
+ - setup_git_directory(): fix move to worktree toplevel directory
299
+ - update-index: fix worktree setup
300
+ + read-tree: setup worktree if merge is required
301
+ + grep: fix worktree setup
302
+ + diff*: fix worktree setup
303
241
-* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
242
- + pack-objects: Allow missing base objects when creating thin packs
304
+The last two fail test suite.
305
+
306
+* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
307
+ + Merge branch 'tr/rev-list-docs' into tr/filter-branch
308
+ + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
309
+ + revision --simplify-merges: make it a no-op without pathspec
310
+ + revision --simplify-merges: do not leave commits unprocessed
311
+ + revision --simplify-merges: use decoration instead of commit->util
312
+ field
313
+ + Documentation: rev-list-options: move --simplify-merges
314
+ documentation
315
+ + Merge branch 'jc/post-simplify' into tr/rev-list-docs
316
+ + filter-branch: use --simplify-merges
317
+ + Merge branch 'jc/post-simplify' into tr/filter-branch
318
+ + filter-branch: fix ref rewriting with --subdirectory-filter
319
+ + filter-branch: Extend test to show rewriting bug
320
+ + Topo-sort before --simplify-merges
321
+ + revision traversal: show full history with merge simplification
322
+ + revision.c: whitespace fix