What's cooking in git.git (Jun 2008, issue #02; Mon, 23)
Junio C Hamano committed
Jul 20, 2008 at 22:58 UTC
093cfb19d18bebfb0d921bed24de8d8b07a681eb
1 file changed
+194
-171
whatscooking.txt
+194
-171
@@ -1,4 +1,4 @@
1
-What's cooking in git.git (Jun 2008, issue #01; Sat, 21)
1
+What's cooking in git.git (Jun 2008, issue #02; Mon, 23)
2
--------------------------------------------------------
3
4
Here are the topics that have been cooking. Commits prefixed
@@ -26,75 +26,25 @@ mv/merge-in-c.
26
----------------------------------------------------------------
27
[New Topics]
28
29
-* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits
30
- - git-merge-recursive-{ours,theirs}
31
- - git-merge-file --ours, --theirs
29
+* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
30
+ - rerere.autoupdate
31
+ - t4200: fix rerere test
32
+ - rerere: remove dubious "tail_optimization"
33
+ - git-rerere: detect unparsable conflicts
34
+ - rerere: rerere_created_at() and has_resolution() abstraction
35
33
-Punting a merge by discarding your own work in conflicting parts but still
34
-salvaging the parts that are cleanly automerged. It is likely that this
35
-will result in nonsense mishmash, but somehow often people want this, so
36
-here they are. The interface to the backends may need to change, though.
36
+* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits
37
+ + t3404: stricter tests for git-rebase--interactive
38
+ + api-builtin.txt: update and fix typo
39
38
-* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit
39
- + racy-git: an empty blob has a fixed object name
40
-
41
-* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit
42
- + Remove the use of '--' in merge program invocation
43
-
44
-* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
45
- - compat/pread.c: Add a forward declaration to fix a warning
46
- - Windows: Fix ntohl() related warnings about printf formatting
47
- - Windows: TMP and TEMP environment variables specify a temporary
48
- directory.
49
- - Windows: Make 'git help -a' work.
50
- - Windows: Work around an oddity when a pipe with no reader is
51
- written to.
52
- - Windows: Make the pager work.
53
- - When installing, be prepared that template_dir may be relative.
54
- - Windows: Use a relative default template_dir and ETC_GITCONFIG
55
- - Windows: Compute the fallback for exec_path from the program
56
- invocation.
57
- - Turn builtin_exec_path into a function.
58
- - Windows: Use a customized struct stat that also has the st_blocks
59
- member.
60
- - Windows: Add a custom implementation for utime().
61
- - Windows: Add a new lstat and fstat implementation based on Win32
62
- API.
63
- - Windows: Implement a custom spawnve().
64
- - Windows: Implement wrappers for gethostbyname(), socket(), and
65
- connect().
66
- - Windows: Work around incompatible sort and find.
67
- - Windows: Implement asynchronous functions as threads.
68
- - Windows: Disambiguate DOS style paths from SSH URLs.
69
- - Windows: A rudimentary poll() emulation.
70
- - Windows: Change the name of hook scripts to make them not
71
- executable.
72
- - Windows: Implement start_command().
73
- - Windows: A pipe() replacement whose ends are not inherited to
74
- children.
75
- - Windows: Wrap execve so that shell scripts can be invoked.
76
- - Windows: Implement setitimer() and sigaction().
77
- - Windows: Fix PRIuMAX definition.
78
- - Windows: Implement gettimeofday().
79
- - Windows: Handle absolute paths in
80
- safe_create_leading_directories().
81
- - Windows: Treat Windows style path names.
82
- - setup.c: Prepare for Windows directory separators.
83
- - Windows: Work around misbehaved rename().
84
- - Windows: always chmod(, 0666) before unlink().
85
- - Windows: A minimal implemention of getpwuid().
86
- - Windows: Implement a wrapper of the open() function.
87
- - Windows: Strip ".exe" from the program name.
88
- - Windows: Use the Windows style PATH separator ';'.
89
- - Add target architecture MinGW.
90
- - Compile some programs only conditionally.
91
- - Add compat/regex.[ch] and compat/fnmatch.[ch].
40
+* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit
41
+ + git-rebase.sh: Add check if rebase is in progress
42
93
-No explanation is necessary ;-).
43
+----------------------------------------------------------------
44
+[Will merge to master soon]
45
95
-* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits
96
- + config.c: make git_env_bool() static
97
- + environment.c: remove unused function
46
+* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit
47
+ + gitweb: standarize HTTP status codes
48
49
* lt/config-fsync (Wed Jun 18 15:18:44 2008 -0700) 4 commits
50
+ Add config option to enable 'fsync()' of object files
@@ -103,13 +53,47 @@ No explanation is necessary ;-).
53
+ Split up default "user" config parsing into helper routine
54
+ Split up default "core" config parsing into helper routine
55
106
-* lw/gitweb (Thu Jun 19 22:03:21 2008 +0200) 1 commit
107
- + gitweb: standarize HTTP status codes
56
+* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
57
+ + Move all dashed-form commands to libexecdir
58
109
-* mv/merge-in-c (Fri Jun 20 01:22:36 2008 +0200) 11 commits
110
- - Add new test to ensure git-merge handles more than 25 refs.
59
+Scheduled for 1.6.0.
60
+
61
+* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
62
+ + merge: remove deprecated summary and diffstat options and config
63
+ variables
64
+
65
+* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits
66
+ + Hook up the result aggregation in the test makefile.
67
+ + A simple script to parse the results from the testcases
68
+ + Modify test-lib.sh to output stats to t/test-results/*
69
+
70
+* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits
71
+ + Teach "git clone" to pack refs
72
+ + Prepare testsuite for a "git clone" that packs refs
73
+ + Move pack_refs() and friends into libgit
74
+ + Incorporate fetched packs in future object traversal
75
+
76
+This is useful when cloning from a repository with insanely large number
77
+of refs.
78
+
79
+* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits
80
+ + Git.pm: add test suite
81
+ + t/test-lib.sh: add test_external and test_external_without_stderr
82
+
83
+Beginning of regression tests for Perl part of the system.
84
+
85
+----------------------------------------------------------------
86
+[Actively Cooking]
87
+
88
+* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 14 commits
89
+ - Add new test case to ensure git-merge reduces octopus parents when
90
+ possible
91
+ - Add new test case to ensure git-merge filters for independent
92
+ parents
93
- Build in merge
112
- - Introduce filter_independent() in commit.c
94
+ - Introduce reduce_heads()
95
+ - Introduce get_merge_bases_many()
96
+ - Add new test to ensure git-merge handles more than 25 refs.
97
- Introduce get_octopus_merge_bases() in commit.c
98
- git-fmt-merge-msg: make it usable from other builtins
99
- Move read_cache_unmerged() to read-cache.c
@@ -120,21 +104,6 @@ No explanation is necessary ;-).
104
- Move commit_list_count() to commit.c
105
- Move split_cmdline() to alias.c
106
123
-* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit
124
- + diff -c/--cc: do not include uninteresting deletion before leading
125
- context
126
-
127
-* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit
128
- + Make git_dir a path relative to work_tree in setup_work_tree()
129
-
130
-----------------------------------------------------------------
131
-[Actively Cooking]
132
-
133
-* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
134
- + Move all dashed-form commands to libexecdir
135
-
136
-Scheduled for 1.6.0.
137
-
107
* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits
108
- Prepare execv_git_cmd() for removal of builtins from the
109
filesystem
@@ -143,23 +112,36 @@ Scheduled for 1.6.0.
112
We do not plan to remove git-foo form completely from the filesystem at
113
this point, but git-shell may need to be updated.
114
146
-* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
147
- + merge: remove deprecated summary and diffstat options and config
148
- variables
149
-
115
* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
116
+ Eliminate an unnecessary chdir("..")
117
+ Add support for GIT_CEILING_DIRECTORIES
118
+ Fold test-absolute-path into test-path-utils
119
+ Implement normalize_absolute_path
120
156
-* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits
157
- + gitweb: Separate generating 'sort by' table header
158
- + gitweb: Separate filling list of projects info
121
+----------------------------------------------------------------
122
+[Graduated to "master"]
123
124
* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit
125
+ Teach new attribute 'export-ignore' to git-archive
126
127
+* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit
128
+ + racy-git: an empty blob has a fixed object name
129
+
130
+* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits
131
+ + config.c: make git_env_bool() static
132
+ + environment.c: remove unused function
133
+
134
+* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit
135
+ + diff -c/--cc: do not include uninteresting deletion before leading
136
+ context
137
+
138
+* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit
139
+ + Make git_dir a path relative to work_tree in setup_work_tree()
140
+
141
+* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits
142
+ + gitweb: Separate generating 'sort by' table header
143
+ + gitweb: Separate filling list of projects info
144
+
145
* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit
146
+ gitweb: remove git_blame and rename git_blame2 to git_blame
147
@@ -173,33 +155,6 @@ this point, but git-shell may need to be updated.
155
+ Add an optional <mode> argument to commit/status -u|--untracked-
156
files option
157
176
-* sr/tests (Sun Jun 8 16:04:35 2008 +0200) 3 commits
177
- + Hook up the result aggregation in the test makefile.
178
- + A simple script to parse the results from the testcases
179
- + Modify test-lib.sh to output stats to t/test-results/*
180
-
181
-* jh/clone-packed-refs (Sun Jun 15 16:06:16 2008 +0200) 4 commits
182
- + Teach "git clone" to pack refs
183
- + Prepare testsuite for a "git clone" that packs refs
184
- + Move pack_refs() and friends into libgit
185
- + Incorporate fetched packs in future object traversal
186
-
187
-This is useful when cloning from a repository with insanely large number
188
-of refs.
189
-
190
-* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit
191
- - Per-ref reflog expiry configuration
192
-
193
-Perhaps a good foundation for optionally unexpirable stash. As 1.6.0 will
194
-be a good time to make backward incompatible changes, we might make expiry
195
-period of stash 'never' in new repositories. Needs a concensus.
196
-
197
-* lw/perlish (Thu Jun 19 22:32:49 2008 +0200) 2 commits
198
- + Git.pm: add test suite
199
- + t/test-lib.sh: add test_external and test_external_without_stderr
200
-
201
-Beginning of regression tests for Perl part of the system.
202
-
158
* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits
159
+ enable whitespace checking of test scripts
160
+ avoid trailing whitespace in zero-change diffstat lines
@@ -213,13 +168,90 @@ Tightens whitespace rules for t/*.sh scripts.
168
+ builtin-fast-export: Add importing and exporting of revision marks
169
170
----------------------------------------------------------------
216
-[Graduated to "master"]
171
+[On Hold]
172
+
173
+* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit
174
+ + Remove the use of '--' in merge program invocation
175
+
176
+Waiting for success reports from people who use various backends.
177
+
178
+* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
179
+ - compat/pread.c: Add a forward declaration to fix a warning
180
+ - Windows: Fix ntohl() related warnings about printf formatting
181
+ - Windows: TMP and TEMP environment variables specify a temporary
182
+ directory.
183
+ - Windows: Make 'git help -a' work.
184
+ - Windows: Work around an oddity when a pipe with no reader is
185
+ written to.
186
+ - Windows: Make the pager work.
187
+ - When installing, be prepared that template_dir may be relative.
188
+ - Windows: Use a relative default template_dir and ETC_GITCONFIG
189
+ - Windows: Compute the fallback for exec_path from the program
190
+ invocation.
191
+ - Turn builtin_exec_path into a function.
192
+ - Windows: Use a customized struct stat that also has the st_blocks
193
+ member.
194
+ - Windows: Add a custom implementation for utime().
195
+ - Windows: Add a new lstat and fstat implementation based on Win32
196
+ API.
197
+ - Windows: Implement a custom spawnve().
198
+ - Windows: Implement wrappers for gethostbyname(), socket(), and
199
+ connect().
200
+ - Windows: Work around incompatible sort and find.
201
+ - Windows: Implement asynchronous functions as threads.
202
+ - Windows: Disambiguate DOS style paths from SSH URLs.
203
+ - Windows: A rudimentary poll() emulation.
204
+ - Windows: Change the name of hook scripts to make them not
205
+ executable.
206
+ - Windows: Implement start_command().
207
+ - Windows: A pipe() replacement whose ends are not inherited to
208
+ children.
209
+ - Windows: Wrap execve so that shell scripts can be invoked.
210
+ - Windows: Implement setitimer() and sigaction().
211
+ - Windows: Fix PRIuMAX definition.
212
+ - Windows: Implement gettimeofday().
213
+ - Windows: Handle absolute paths in
214
+ safe_create_leading_directories().
215
+ - Windows: Treat Windows style path names.
216
+ - setup.c: Prepare for Windows directory separators.
217
+ - Windows: Work around misbehaved rename().
218
+ - Windows: always chmod(, 0666) before unlink().
219
+ - Windows: A minimal implemention of getpwuid().
220
+ - Windows: Implement a wrapper of the open() function.
221
+ - Windows: Strip ".exe" from the program name.
222
+ - Windows: Use the Windows style PATH separator ';'.
223
+ - Add target architecture MinGW.
224
+ - Compile some programs only conditionally.
225
+ - Add compat/regex.[ch] and compat/fnmatch.[ch].
226
+
227
+No explanation is necessary ;-). The series is probably 'next' worthy
228
+as-is.
229
+
230
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
231
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
232
+ asked for
233
218
-Nothing today but expect many small ones to come out of 'next' this
219
-weekend.
234
+This would be the right thing to do for command line use, but gitk will be
235
+hit due to tcl/tk's limitation, so I am holding this back for now.
236
237
----------------------------------------------------------------
222
-[On Hold]
238
+[Stalled/Needs more work]
239
+
240
+* jc/reflog-expire (Sun Jun 15 23:48:46 2008 -0700) 1 commit
241
+ - Per-ref reflog expiry configuration
242
+
243
+Perhaps a good foundation for optionally unexpirable stash. As 1.6.0 will
244
+be a good time to make backward incompatible changes, we might make expiry
245
+period of stash 'never' in new repositories. Needs a concensus.
246
+
247
+* jc/merge-theirs (Fri Jun 20 00:17:59 2008 -0700) 2 commits
248
+ - git-merge-recursive-{ours,theirs}
249
+ - git-merge-file --ours, --theirs
250
+
251
+Punting a merge by discarding your own work in conflicting parts but still
252
+salvaging the parts that are cleanly automerged. It is likely that this
253
+will result in nonsense mishmash, but somehow often people want this, so
254
+here they are. The interface to the backends may need to change, though.
255
256
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
257
- blame: show "previous" information in --porcelain/--incremental
@@ -240,67 +272,58 @@ The tip two commits are for peeling to see what's behind the blamed
272
commit, which we should be able to separate out into an independent topic
273
from the rest.
274
243
-* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
244
- - "git push": tellme-more protocol extension
245
-
246
-Kicked back to 'pu' for now.
247
-
248
-* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
249
- - Use perl instead of tac
250
- - Fix t3404 assumption that `wc -l` does not use whitespace.
251
- - rebase -i: Use : in expr command instead of match.
252
- - rebase -i: update the implementation of 'mark' command
253
- - Add option --preserve-tags
254
- - Teach rebase interactive the tag command
255
- - Add option --first-parent
256
- - Do rebase with preserve merges with advanced TODO list
257
- - Select all lines with fake-editor
258
- - Unify the length of $SHORT* and the commits in the TODO list
259
- - Teach rebase interactive the merge command
260
- - Move redo merge code in a function
261
- - Teach rebase interactive the reset command
262
- - Teach rebase interactive the mark command
263
- - Move cleanup code into it's own function
264
- - Don't append default merge message to -m message
265
- - fake-editor: output TODO list if unchanged
266
-
267
-It is very likely that this whole thing will be reverted from 'next' and
268
-be replaced with the new sequenser series during 1.6.0 cycle.
275
+----------------------------------------------------------------
276
+[Dropped for now]
277
278
* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits
271
- - Introduce fast forward option only
272
- - Head reduction before selecting merge strategy
273
- - Restructure git-merge.sh
274
- - Introduce -ff=<fast forward option>
275
- - New merge tests
276
- - Documentation for joining more than two histories
279
+ . Introduce fast forward option only
280
+ . Head reduction before selecting merge strategy
281
+ . Restructure git-merge.sh
282
+ . Introduce -ff=<fast forward option>
283
+ . New merge tests
284
+ . Documentation for joining more than two histories
285
286
This will interfere with Miklos's rewrite of merge to C.
287
280
-* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
281
- - diff: enable "too large a rename" warning when -M/-C is explicitly
282
- asked for
283
-
284
-This would be the right thing to do for command line use, but gitk will be
285
-hit due to tcl/tk's limitation, so I am holding this back for now.
288
+* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits
289
+ . Use perl instead of tac
290
+ . Fix t3404 assumption that `wc -l` does not use whitespace.
291
+ . rebase -i: Use : in expr command instead of match.
292
+ . rebase -i: update the implementation of 'mark' command
293
+ . Add option --preserve-tags
294
+ . Teach rebase interactive the tag command
295
+ . Add option --first-parent
296
+ . Do rebase with preserve merges with advanced TODO list
297
+ . Select all lines with fake-editor
298
+ . Unify the length of $SHORT* and the commits in the TODO list
299
+ . Teach rebase interactive the merge command
300
+ . Move redo merge code in a function
301
+ . Teach rebase interactive the reset command
302
+ . Teach rebase interactive the mark command
303
+ . Move cleanup code into it's own function
304
+ . Don't append default merge message to -m message
305
+ . fake-editor: output TODO list if unchanged
306
307
* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits
288
- - WIP: rethink replay merge
289
- - Start using replay-tree merge in cherry-pick
290
- - revert/cherry-pick: start refactoring call to merge_recursive
308
+ . WIP: rethink replay merge
309
+ . Start using replay-tree merge in cherry-pick
310
+ . revert/cherry-pick: start refactoring call to merge_recursive
311
312
This is meant to improve cherry-pick's behaviour when renames are
313
involved, by not using merge-recursive (whose d/f conflict resolution is
314
quite broken), but unfortunately has stalled for some time now.
315
316
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
297
- - git-am --forge: add Signed-off-by: line for the author
298
- - git-am: clean-up Signed-off-by: lines
299
- - stripspace: add --log-clean option to clean up signed-off-by:
317
+ . git-am --forge: add Signed-off-by: line for the author
318
+ . git-am: clean-up Signed-off-by: lines
319
+ . stripspace: add --log-clean option to clean up signed-off-by:
320
lines
301
- - stripspace: use parse_options()
302
- - Add "git am -s" test
303
- - git-am: refactor code to add signed-off-by line for the committer
321
+ . stripspace: use parse_options()
322
+ . Add "git am -s" test
323
+ . git-am: refactor code to add signed-off-by line for the committer
324
325
Just my toy at this moment.
326
327
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
328
+ . "git push": tellme-more protocol extension
329
+