What's cooking (2008/08 #09)
Junio C Hamano committed
Aug 31, 2008 at 23:15 UTC
47172ba7bbadd10093112fb28e140e9d162d3a33
1 file changed
+138
-115
whats-cooking.txt
+138
-115
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Aug 2008, #08; Wed, 27)
2
-X-master-at: a1184d85e8752658f02746982822f43f32316803
3
-X-next-at: 9f25cb4fbeed4ff00c19fe462492a5ee6dfb82b3
1
+Subject: What's cooking in git.git (Aug 2008, #09; Sun, 31)
2
+X-master-at: 7f314565fe20e324e8db1a7c233e43ca4e3683f0
3
+X-next-at: 007e493846da7bb03b026e90ac0af8bdea9d0d0c
4
5
-What's cooking in git.git (Aug 2008, #08; Wed, 27)
5
+What's cooking in git.git (Aug 2008, #09; Sun, 31)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -15,40 +15,91 @@ meant to be merged to the maintenance series have "maint-" in their names.
15
----------------------------------------------------------------
16
[New Topics]
17
18
-* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
19
- - Teach git.el to mark/unmark files by regexp
20
- - git.el: Diff only file at point by default
18
+Most of them are expected to spend only short amount of time on 'next'
19
+before graduating to 'master'.
20
+
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
23
+
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
26
+
27
+* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
28
+ + fixup_pack_header_footer(): use nicely aligned buffer sizes
29
+ + index-pack: use fixup_pack_header_footer()'s validation mode
30
+ + pack-objects: use fixup_pack_header_footer()'s validation mode
31
+ + improve reliability of fixup_pack_header_footer()
32
+ + pack-objects: improve returned information from write_one()
33
+
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
22
-With my limited elisp expertise I did not see anything obviously wrong
23
-with these two patches from David Kågedal and David Christensen.
65
+* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
66
+ + builtin-help: fallback to GIT_MAN_VIEWER before man
67
25
-* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit
26
- - git-p4: Fix checkout bug when using --import-local.
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
+
72
+* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
73
+ + 'git foo' program identifies itself without dash in die() messages
74
+ + Start conforming code to "git subcmd" style
75
+
76
+* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit
77
+ + git commit --author=$name: look $name up in existing commits
78
28
-A fix forked from 'maint' waiting for an Ack.
79
+* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit
80
+ + cast pid_t's to uintmax_t to improve portability
81
+
82
+* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits
83
+ - setup_git_directory(): fix move to worktree toplevel directory
84
+ - update-index: fix worktree setup
85
+ + read-tree: setup worktree if merge is required
86
+ + grep: fix worktree setup
87
+ + diff*: fix worktree setup
88
+
89
+The last two fail test suite.
90
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
34
- . Use xdiff caching to improve git blame performance
35
- . Allow xdiff machinery to cache hash results for a file
36
- . Always initialize xpparam_t to 0
37
- . Bypass textual patch generation and parsing in git blame
38
- . Allow alternate "low-level" emit function from xdl_diff
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
42
-* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
43
- - discard_cache: reset lazy name_hash bit
44
-
45
-I spotted this by accident while working on something unrelated.
46
-
47
-When a program calls discard_cache() to read the index again, we do not
48
-properly re-initialize the name_hash structure that is used by the case
49
-insensitivitly logic. This _might_ improve issues people may be having on
50
-case insensitive filesystems. I dunno.
51
-
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
@@ -56,84 +107,85 @@ case insensitive filesystems. I dunno.
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
59
-* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
60
- - date/time: do not get confused by fractional seconds
110
+----------------------------------------------------------------
111
+[Will be merged to "master" soon]
112
+
113
+* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
114
+ + Merge branch 'tr/rev-list-docs' into tr/filter-branch
115
+ + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
116
+ + revision --simplify-merges: make it a no-op without pathspec
117
+ + revision --simplify-merges: do not leave commits unprocessed
118
+ + revision --simplify-merges: use decoration instead of commit->util
119
+ field
120
+ + Documentation: rev-list-options: move --simplify-merges
121
+ documentation
122
+ + Merge branch 'jc/post-simplify' into tr/rev-list-docs
123
+ + filter-branch: use --simplify-merges
124
+ + Merge branch 'jc/post-simplify' into tr/filter-branch
125
+ + filter-branch: fix ref rewriting with --subdirectory-filter
126
+ + filter-branch: Extend test to show rewriting bug
127
+ + Topo-sort before --simplify-merges
128
+ + revision traversal: show full history with merge simplification
129
+ + revision.c: whitespace fix
130
62
-Linus hints further enhancements as "the right way", so let's see if
63
-somebody else steps up and tries it before merging this to 'next'.
131
+This now merges up all (and only) the necessary pieces from the
132
+post-simplify topic and the documentation updates, ready to be merged to
133
+"master".
134
135
----------------------------------------------------------------
136
[Actively Cooking]
137
68
-* sb/daemon (Sun Aug 24 13:27:10 2008 -0700) 5 commits
69
- + daemon.c: minor style fixup
70
- + git-daemon: rewrite kindergarden, new option --max-connections
71
- + git-daemon: Simplify dead-children reaping logic
72
- + git-daemon: use LOG_PID, simplify logging code
73
- + git-daemon: call logerror() instead of error()
138
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
139
+ + date/time: do not get confused by fractional seconds
140
75
-I re-reviewed the changes and they look quite sane. Hopefully be moved to
76
-'master' soonish.
141
+* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
142
+ + discard_cache: reset lazy name_hash bit
143
78
-* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 3 commits
79
- - git-add --intent-to-add (-N)
80
- - cached_object: learn empty blob
81
- - sha1_object_info(): pay attention to cached objects
144
+I spotted this by accident while working on something unrelated.
145
+
146
+When a program calls discard_cache() to read the index again, we do not
147
+properly re-initialize the name_hash structure that is used by the case
148
+insensitivitly logic. This _might_ improve issues people may be having on
149
+case insensitive filesystems. I dunno.
150
+
151
+* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
152
+ + git-add --intent-to-add (-N)
153
154
Teaches "git add" to record only the intent to add a path later.
84
-I think this is better done without the hardcoded empty blob object.
155
+I rerolled this without the fake empty blob object.
156
157
* cc/bisect (Fri Aug 22 05:52:29 2008 +0200) 2 commits
158
+ bisect: only check merge bases when needed
159
+ bisect: test merge base if good rev is not an ancestor of bad rev
160
90
-* mv/merge-recursive (Mon Aug 25 16:25:57 2008 +0200) 3 commits
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
166
95
-Miklos's update; will move to 'next' shortly after reading it again.
96
-
167
* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
98
- - diff: vary default prefix depending on what are compared
168
+ + diff: vary default prefix depending on what are compared
169
170
As some people may have noticed, I've been running with this one when
171
sending out "How about this" patches to the discussion threads.
172
103
-* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
104
- + pack-objects: Allow missing base objects when creating thin packs
105
-
106
-* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 7 commits
107
- + filter-branch: use --simplify-merges
108
- + filter-branch: fix ref rewriting with --subdirectory-filter
109
- + filter-branch: Extend test to show rewriting bug
110
-
111
-Fixes a longstanding filter branch bug. Success stories?
112
-Later parts depends on the earlier part of "--simplify-merges"
113
-
114
-* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 8 commits
173
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
174
- revision --simplify-merges: incremental simplification
175
- revision --simplify-merges: prepare for incremental simplification
117
- - revision --simplify-merges: make it a no-op without pathspec
118
- + revision --simplify-merges: do not leave commits unprocessed
119
- + revision --simplify-merges: use decoration instead of commit->util
120
- field
121
- + Topo-sort before --simplify-merges
122
- + revision traversal: show full history with merge simplification
123
- + revision.c: whitespace fix
124
-
125
-"log --full-history" is with too much clutter, "log" itself is too cleverer
126
-than some people, and here is the middle level of merge simplification.
176
177
I started making this incremental but the progress is not so great.
178
130
-* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 5 commits
131
- + Documentation: rev-list-options: move --simplify-merges
132
- documentation
133
-
179
----------------------------------------------------------------
180
[On Hold]
181
182
+* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
183
+ - Teach git.el to mark/unmark files by regexp
184
+ - git.el: Diff only file at point by default
185
+
186
+These are still queued but Alexandre had improvement requests so these
187
+will likely be dropped.
188
+
189
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
190
- git-am --forge: add Signed-off-by: line for the author
191
- git-am: clean-up Signed-off-by: lines
@@ -143,6 +195,8 @@ I started making this incremental but the progress is not so great.
195
- Add "git am -s" test
196
- git-am: refactor code to add signed-off-by line for the committer
197
198
+The one at second from the tip needs reworking.
199
+
200
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
201
- "git push": tellme-more protocol extension
202
@@ -164,11 +218,6 @@ that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
218
in 1.7.0, but with the loud whining about moving git-foo out of $PATH we
219
have been hearing, it might not be a bad idea to drop this.
220
167
-* jc/dashless (Wed Jun 25 15:55:11 2008 -0700) 1 commit
168
- . Make clients ask for "git program" over ssh and local transport
169
-
170
-And this is now dropped.
171
-
221
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
222
- diff: enable "too large a rename" warning when -M/-C is explicitly
223
asked for
@@ -179,41 +228,15 @@ hit due to tcl/tk's limitation, so I am holding this back for now.
228
----------------------------------------------------------------
229
[Graduated to "master"]
230
182
-* mv/maint-merge-fix (Sat Aug 23 12:56:57 2008 -0700) 1 commit
183
- + merge: fix numerus bugs around "trivial merge" area
184
-
185
-* ml/submodule (Thu Aug 21 19:54:01 2008 -0400) 2 commits
186
- + git-submodule.sh - Remove trailing / from URL if found
187
- + git-submodule.sh - Remove trailing / from URL if found
188
-
189
-Soon to be in 'master', I guess.
190
-
191
-* np/verify-pack (Fri Aug 22 15:45:53 2008 -0400) 1 commit
192
- + discard revindex data when pack list changes
193
-
194
-* jc/no-slim-shell (Tue Aug 19 18:05:43 2008 -0700) 2 commits
195
- + Build-in "git-shell"
196
- + shell: do not play duplicated definition games to shrink the
197
- executable
198
-
199
-* mv/merge-custom (Sat Aug 23 19:23:22 2008 -0700) 9 commits
200
- + t7606: fix custom merge test
201
- + Fix "git-merge -s bogo" help text
202
- + Update .gitignore to ignore git-help
203
- + Builtin git-help.
204
- + builtin-help: always load_command_list() in cmd_help()
205
- + Add a second testcase for handling invalid strategies in git-merge
206
- + Add a new test for using a custom merge strategy
207
- + builtin-merge: allow using a custom strategy
208
- + builtin-help: make some internal functions available to other
209
- builtins
210
-
211
-The one at the tip fixes a test that assumed git-merge has a broken
212
-"trivial merge" implementation.
231
+* tl/p4 (Thu Aug 28 00:36:12 2008 +0200) 1 commit
232
+ + git-p4: Fix checkout bug when using --import-local.
233
214
-* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
215
- + builtin-add.c: optimize -A option and "git add ."
216
- + builtin-add.c: restructure the code for maintainability
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()
240
218
-* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
219
- + Make cherry-pick use rerere for conflict resolution.
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