What's cooking (2008/06 #03)
Junio C Hamano committed
Aug 5, 2008 at 21:44 UTC
5ac8548c9f0eae980f67aaf2d88984ad30bce613
1 file changed
+42
-76
whats-cooking.txt
+42
-76
@@ -1,6 +1,6 @@
1
-Subject: What's cooking in git.git (Jun 2008, issue #02; Mon, 23)
1
+Subject: What's cooking in git.git (Jun 2008, issue #03; Wed, 25)
2
3
-What's cooking in git.git (Jun 2008, issue #02; Mon, 23)
3
+What's cooking in git.git (Jun 2008, issue #03; Wed, 25)
4
--------------------------------------------------------
5
6
Here are the topics that have been cooking. Commits prefixed
@@ -21,26 +21,21 @@ good set of feature enhancements. But bigger changes will be:
21
22
* git-merge will be rewritten in C.
23
24
-Currently tip of 'pu' is broken and does not pass tests, as j6t/mingw has
25
-interaction with dr/ceiling and jc/merge-theirs has interaction with
26
-mv/merge-in-c.
24
+ * default pack and idx versions will be updated as scheduled for some
25
+ time ago.
26
27
----------------------------------------------------------------
28
[New Topics]
29
31
-* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
32
- - rerere.autoupdate
33
- - t4200: fix rerere test
34
- - rerere: remove dubious "tail_optimization"
35
- - git-rerere: detect unparsable conflicts
36
- - rerere: rerere_created_at() and has_resolution() abstraction
37
-
38
-* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits
39
- + t3404: stricter tests for git-rebase--interactive
40
- + api-builtin.txt: update and fix typo
41
-
42
-* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit
43
- + git-rebase.sh: Add check if rebase is in progress
30
+* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
31
+ - Migrate git-blame to parse-option partially.
32
+ - parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
33
+ - parse-opt: fake short strings for callers to believe in.
34
+ - parse-opt: do not pring errors on unknown options, return -2
35
+ intead.
36
+ - parse-opt: create parse_options_step.
37
+ - parse-opt: Export a non NORETURN usage dumper.
38
+ - parse-opt: have parse_options_{start,end}.
39
40
----------------------------------------------------------------
41
[Will merge to master soon]
@@ -55,10 +50,12 @@ mv/merge-in-c.
50
+ Split up default "user" config parsing into helper routine
51
+ Split up default "core" config parsing into helper routine
52
58
-* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit
53
+* nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits
54
+ + Keep some git-* programs in $(bindir)
55
+ Move all dashed-form commands to libexecdir
56
61
-Scheduled for 1.6.0.
57
+Scheduled for 1.6.0. We'll leave server-side programs in $(bindir)
58
+so that ssh clients can ask for "git-program" and find them on the $PATH.
59
60
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
61
+ merge: remove deprecated summary and diffstat options and config
@@ -87,11 +84,9 @@ Beginning of regression tests for Perl part of the system.
84
----------------------------------------------------------------
85
[Actively Cooking]
86
90
-* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 14 commits
87
+* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 12 commits
88
- Add new test case to ensure git-merge reduces octopus parents when
89
possible
93
- - Add new test case to ensure git-merge filters for independent
94
- parents
90
- Build in merge
91
- Introduce reduce_heads()
92
- Introduce get_merge_bases_many()
@@ -99,17 +94,18 @@ Beginning of regression tests for Perl part of the system.
94
- Introduce get_octopus_merge_bases() in commit.c
95
- git-fmt-merge-msg: make it usable from other builtins
96
- Move read_cache_unmerged() to read-cache.c
102
- - parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option
97
- Add new test to ensure git-merge handles pull.twohead and
98
pull.octopus
99
- Move parse-options's skip_prefix() to git-compat-util.h
100
- Move commit_list_count() to commit.c
101
- Move split_cmdline() to alias.c
102
103
+I dropped the change to parseopt in this series and fixed up the caller.
104
+
105
* jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits
110
- - Prepare execv_git_cmd() for removal of builtins from the
106
+ + Prepare execv_git_cmd() for removal of builtins from the
107
filesystem
112
- - git-shell: accept "git foo" form
108
+ + git-shell: accept "git foo" form
109
110
We do not plan to remove git-foo form completely from the filesystem at
111
this point, but git-shell may need to be updated.
@@ -120,54 +116,23 @@ this point, but git-shell may need to be updated.
116
+ Fold test-absolute-path into test-path-utils
117
+ Implement normalize_absolute_path
118
123
-----------------------------------------------------------------
124
-[Graduated to "master"]
125
-
126
-* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit
127
- + Teach new attribute 'export-ignore' to git-archive
128
-
129
-* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit
130
- + racy-git: an empty blob has a fixed object name
131
-
132
-* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits
133
- + config.c: make git_env_bool() static
134
- + environment.c: remove unused function
135
-
136
-* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit
137
- + diff -c/--cc: do not include uninteresting deletion before leading
138
- context
139
-
140
-* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit
141
- + Make git_dir a path relative to work_tree in setup_work_tree()
142
-
143
-* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits
144
- + gitweb: Separate generating 'sort by' table header
145
- + gitweb: Separate filling list of projects info
146
-
147
-* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit
148
- + gitweb: remove git_blame and rename git_blame2 to git_blame
149
-
150
-* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits
151
- + Make old sha1 optional with git update-ref -d
152
- + Clean up builtin-update-ref's option parsing
119
+* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
120
+ - rerere.autoupdate
121
+ - t4200: fix rerere test
122
+ - rerere: remove dubious "tail_optimization"
123
+ - git-rerere: detect unparsable conflicts
124
+ - rerere: rerere_created_at() and has_resolution() abstraction
125
154
-* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits
155
- + Add configuration option for default untracked files mode
156
- + Add argument 'no' commit/status option -u|--untracked-files
157
- + Add an optional <mode> argument to commit/status -u|--untracked-
158
- files option
126
+* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits
127
+ + t3404: stricter tests for git-rebase--interactive
128
+ + api-builtin.txt: update and fix typo
129
160
-* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits
161
- + enable whitespace checking of test scripts
162
- + avoid trailing whitespace in zero-change diffstat lines
163
- + avoid whitespace on empty line in automatic usage message
164
- + mask necessary whitespace policy violations in test scripts
165
- + fix whitespace violations in test scripts
130
+* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit
131
+ + git-rebase.sh: Add check if rebase is in progress
132
167
-Tightens whitespace rules for t/*.sh scripts.
133
+----------------------------------------------------------------
134
+[Graduated to "master"]
135
169
-* pb/fast-export (Wed Jun 11 13:17:04 2008 +0200) 1 commit
170
- + builtin-fast-export: Add importing and exporting of revision marks
136
137
----------------------------------------------------------------
138
[On Hold]
@@ -177,7 +142,7 @@ Tightens whitespace rules for t/*.sh scripts.
142
143
Waiting for success reports from people who use various backends.
144
180
-* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits
145
+* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 39 commits
146
- compat/pread.c: Add a forward declaration to fix a warning
147
- Windows: Fix ntohl() related warnings about printf formatting
148
- Windows: TMP and TEMP environment variables specify a temporary
@@ -212,22 +177,23 @@ Waiting for success reports from people who use various backends.
177
- Windows: Implement setitimer() and sigaction().
178
- Windows: Fix PRIuMAX definition.
179
- Windows: Implement gettimeofday().
215
- - Windows: Handle absolute paths in
216
- safe_create_leading_directories().
217
- - Windows: Treat Windows style path names.
218
- - setup.c: Prepare for Windows directory separators.
180
+ - Make my_mktime() public and rename it to tm_to_time_t()
181
- Windows: Work around misbehaved rename().
182
- Windows: always chmod(, 0666) before unlink().
183
- Windows: A minimal implemention of getpwuid().
184
- Windows: Implement a wrapper of the open() function.
185
- Windows: Strip ".exe" from the program name.
186
+ - Windows: Handle absolute paths in
187
+ safe_create_leading_directories().
188
+ - Windows: Treat Windows style path names.
189
+ - setup.c: Prepare for Windows directory separators.
190
- Windows: Use the Windows style PATH separator ';'.
191
- Add target architecture MinGW.
192
- Compile some programs only conditionally.
193
- Add compat/regex.[ch] and compat/fnmatch.[ch].
194
195
No explanation is necessary ;-). The series is probably 'next' worthy
230
-as-is.
196
+as-is, except that template renaming hack won't be needed anymore.
197
198
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
199
- diff: enable "too large a rename" warning when -M/-C is explicitly