What's cooking 2008-08-14
Junio C Hamano committed
Aug 14, 2008 at 01:52 UTC
72786a7e7467d2cddbd848fc1ed47edfc33d4a30
1 file changed
+223
whats/cooking/2008/08/03.txt
new
+223
@@ -0,0 +1,223 @@
1
+Subject: What's cooking in git.git (Aug 2008, #03; Thu, 14)
2
+X-master-at: a0653d550524a0263d36fde6a8cf98941dd057ab
3
+X-next-at: 8dd0c03fb2b8807ef71d5e807e65818dbd05a118
4
+
5
+What's cooking in git.git (Aug 2008, #03; Thu, 14)
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
+* ak/p4 (Sun Aug 10 19:26:35 2008 +0100) 12 commits
19
+ + Put in the two other configuration elements found in the source
20
+ + Put some documentation in about the parameters that have been
21
+ added
22
+ + Move git-p4.syncFromOrigin into a configuration parameters section
23
+ + Consistently use 'git-p4' for the configuration entries
24
+ + If the user has configured various parameters, use them.
25
+ + Switch to using 'p4_build_cmd'
26
+ + If we are in verbose mode, output what we are about to run (or
27
+ return)
28
+ + Add a single command that will be used to construct the 'p4'
29
+ command
30
+ + Utilise the new 'p4_system' function.
31
+ + Have a command that specifically invokes 'p4' (via system)
32
+ + Utilise the new 'p4_read_pipe_lines' command
33
+ + Create a specific version of the read_pipe_lines command for p4
34
+ invocations
35
+
36
+Warmly received by the primary contributor of git-p4; I do not mind
37
+merging this before 1.6.0.
38
+
39
+* mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
40
+ - Make builtin-revert.c use merge_recursive_generic()
41
+ - merge-recursive.c: Add more generic merge_recursive_generic()
42
+ - Split out merge_recursive() to merge-recursive.c
43
+
44
+I do not think builtlin-revert should use "recursive", but these patches
45
+give a good starting point to separate the bulk of the "rename-aware
46
+three-way merge" into library form.
47
+
48
+* tr/rev-list-docs (Tue Aug 12 01:55:37 2008 +0200) 1 commit
49
+ + Documentation: rev-list-options: move --simplify-merges
50
+ documentation
51
+
52
+* sp/missing-thin-base (Tue Aug 12 11:31:06 2008 -0700) 1 commit
53
+ + pack-objects: Allow missing base objects when creating thin packs
54
+
55
+* tr/filter-branch (Tue Aug 12 10:45:59 2008 +0200) 4 commits
56
+ - filter-branch: use --simplify-merges
57
+ - Merge branch 'jc/post-simplify' into tr/filter-branch
58
+ - filter-branch: fix ref rewriting with --subdirectory-filter
59
+ - filter-branch: Extend test to show rewriting bug
60
+
61
+* js/checkout-dwim-local (Sat Aug 9 16:00:12 2008 +0200) 1 commit
62
+ + checkout --track: make up a sensible branch name if '-b' was
63
+ omitted
64
+
65
+I like this low-impact usability enhancement; will most likely be in
66
+master soon after 1.6.0.
67
+
68
+* bd/diff-strbuf (Wed Aug 13 23:18:22 2008 -0700) 3 commits
69
+ + xdiff-interface: hide the whole "xdiff_emit_state" business from
70
+ the caller
71
+ + Use strbuf for struct xdiff_emit_state's remainder
72
+ + Make xdi_diff_outf interface for running xdiff_outf diffs
73
+
74
+Gives measurable performance improvement to textual diff generation. For
75
+improving "blame" performance, it might be more effective to hook directly
76
+to lower level of xdiff machinery so that we do not even have to generate
77
+patch only to discard after reading "@@ -l,k +m,n @@" lines, but that
78
+would be a separate topic.
79
+
80
+* am/cherry-pick-rerere (Sun Aug 10 17:18:55 2008 +0530) 1 commit
81
+ + Make cherry-pick use rerere for conflict resolution.
82
+
83
+----------------------------------------------------------------
84
+[On Hold and/or Cooking]
85
+
86
+* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit
87
+ - tests: use $TEST_DIRECTORY to refer to the t/ directory
88
+
89
+* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits
90
+ + Add test for diff-tree --stdin with two trees
91
+ + Teach git diff-tree --stdin to diff trees
92
+ + diff-tree: Note that the commit ID is printed with --stdin
93
+ + Refactoring: Split up diff_tree_stdin
94
+
95
+* js/parallel-test (Fri Aug 8 13:08:37 2008 +0200) 3 commits
96
+ + Enable parallel tests
97
+ + tests: Clarify dependencies between tests, 'aggregate-results' and
98
+ 'clean'
99
+ + t9700: remove useless check
100
+
101
+* xx/post-1.6.0 (Mon Aug 11 21:45:52 2008 -0400) 7 commits
102
+ + git-submodule foreach - Include output and clarify usage.
103
+ + Fix commit_tree() buffer leak
104
+ + Teach git log --exit-code to return an appropriate exit code
105
+ + Teach git log --check to return an appropriate exit code
106
+ + git-submodule - Add 'foreach' subcommand
107
+ + builtin-reflog: Allow reflog expire to name partial ref
108
+ + git-am: ignore --binary option
109
+
110
+Random collection of patches to queue for post-1.6.0 development.
111
+
112
+* jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
113
+ + Topo-sort before --simplify-merges
114
+ + revision traversal: show full history with merge simplification
115
+ + revision.c: whitespace fix
116
+
117
+"log --full-history" is with too much clutter, "log" itself is too cleverer
118
+than some people, and here is the middle level of merge simplification.
119
+
120
+* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
121
+ - [do not merge -- original version] Add Git-aware CGI for Git-aware
122
+ smart HTTP transport
123
+ - Add backdoor options to receive-pack for use in Git-aware CGI
124
+
125
+The "magic" detection protocol was revised to use POST to info/refs; the
126
+top one queued is from before that discussion.
127
+
128
+* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
129
+ + add: refuse to add working tree items beyond symlinks
130
+ + update-index: refuse to add working tree items beyond symlinks
131
+
132
+Fix for a longstanding bug that allows "git add" and "git update-index" to
133
+add a path "a/b" to the index when "a" is a symbolic link. We would need
134
+a similar fix for the case where "a" is a submodule.
135
+
136
+* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
137
+ + add --no-filters option to git hash-object
138
+ + add --path option to git hash-object
139
+ + use parse_options() in git hash-object
140
+ + correct usage help string for git-hash-object
141
+ + correct argument checking test for git hash-object
142
+ + teach index_fd to work with pipes
143
+
144
+Gives a bit more flexibility to hash-objects by allowing us to lie about
145
+the path the contents comes from.
146
+
147
+* mv/merge-custom (Wed Aug 13 23:32:43 2008 +0200) 7 commits
148
+ + Update .gitignore to ignore git-help
149
+ + Builtin git-help.
150
+ + builtin-help: always load_command_list() in cmd_help()
151
+ + Add a second testcase for handling invalid strategies in git-merge
152
+ + Add a new test for using a custom merge strategy
153
+ + builtin-merge: allow using a custom strategy
154
+ + builtin-help: make some internal functions available to other
155
+ builtins
156
+
157
+* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
158
+ + git-merge-octopus: use (merge-base A (merge B C D E...)) for
159
+ stepwise merge
160
+ + merge-base-many: add trivial tests based on the documentation
161
+ + documentation: merge-base: explain "git merge-base" with more than
162
+ 2 args
163
+ + merge-base: teach "git merge-base" to drive underlying
164
+ merge_bases_many()
165
+
166
+* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
167
+ + Documentation: Improve documentation for git-imap-send(1)
168
+ + imap-send.c: more style fixes
169
+ + imap-send.c: style fixes
170
+ + git-imap-send: Support SSL
171
+ + git-imap-send: Allow the program to be run from subdirectories of
172
+ a git tree
173
+
174
+Some people seem to prefer having this feature available also with gnutls.
175
+Such an enhancement can be done in-tree on top of this series if they are
176
+so inclined.
177
+
178
+* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
179
+ - bisect: only check merge bases when needed
180
+ - bisect: test merge base if good rev is not an ancestor of bad rev
181
+
182
+The first one alone does not pass its self-test but combined together they
183
+seem to. It does not build confidence as the latter one is supposed to be
184
+an optimization only.
185
+
186
+* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
187
+ + builtin-add.c: optimize -A option and "git add ."
188
+ + builtin-add.c: restructure the code for maintainability
189
+
190
+* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
191
+ + spawn pager via run_command interface
192
+ + run-command: add pre-exec callback
193
+
194
+This changes the parent-child relationship between the pager and the git
195
+process. We used to make pager the parent which meant that the exit
196
+status from git is lost from the caller.
197
+
198
+* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
199
+ + Enable threaded delta search on *BSD and Linux.
200
+
201
+* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
202
+ + merge: remove deprecated summary and diffstat options and config
203
+ variables
204
+
205
+This was previously in "will be in master soon" category, but it turns out
206
+that the synonyms to the ones this one deletes are fairly new invention
207
+that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
208
+in 1.7.0.
209
+
210
+* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
211
+ + Revert "Make clients ask for "git program" over ssh and local
212
+ transport"
213
+ + Make clients ask for "git program" over ssh and local transport
214
+
215
+This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
216
+timeframe.
217
+
218
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
219
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
220
+ asked for
221
+
222
+This would be the right thing to do for command line use, but gitk will be
223
+hit due to tcl/tk's limitation, so I am holding this back for now.