What's cooking (2010/12 #01)
Junio C Hamano committed
Dec 4, 2010 at 22:27 UTC
8f05eeee27d352c2f0f140935c63e7de5904dbdc
1 file changed
+370
-327
whats-cooking.txt
+370
-327
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2010, #03; Wed, 24)
3
-X-master-at: 7d43de925b2771d295d8fc4341b7bd544e2a74fa
4
-X-next-at: 03864edeab230c99aac705ab795ed9e8b63cc7d3
2
+Subject: What's cooking in git.git (Dec 2010, #01; Sat, 4)
3
+X-master-at: 0b0cd0e0a29a139f418991dd769ea4266ffec370
4
+X-next-at: 98527b968b3ba19b57ff8906ec69d51dceda9030
5
6
-What's cooking in git.git (Nov 2010, #03; Wed, 24)
6
+What's cooking in git.git (Dec 2010, #01; Sat, 4)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,6 +14,322 @@ still holding onto them.
14
--------------------------------------------------
15
[New Topics]
16
17
+* aa/status-hilite-branch (2010-11-18) 1 commit
18
+ - status: show branchname with a configurable color
19
+
20
+I am indifferent/uninterested; I don't see anything wrong with it, but I
21
+do not find coloring the field particularly useful myself.
22
+
23
+* ef/help-cmd-prefix (2010-11-26) 2 commits
24
+ - (jc) review comments
25
+ - help: always suggest common-cmds if prefix of cmd
26
+
27
+Reroll, or squash?
28
+
29
+* jn/fast-import-blob-access (2010-12-03) 5 commits
30
+ - t9300: remove unnecessary use of /dev/stdin
31
+ - fast-import: Allow cat-blob requests at arbitrary points in stream
32
+ - fast-import: let importers retrieve blobs
33
+ - fast-import: clarify documentation of "feature" command
34
+ - fast-import: stricter parsing of integer options
35
+
36
+Will merge to 'next' soon.
37
+
38
+* jn/gitweb-per-request-config (2010-11-28) 2 commits
39
+ - gitweb: document $per_request_config better
40
+ - gitweb: selectable configurations that change with each request
41
+
42
+Will merge to 'next' soon.
43
+
44
+* kb/diff-C-M-synonym (2010-11-29) 1 commit
45
+ - diff: add --detect-copies-harder as a synonym for --find-copies-harder
46
+
47
+Will merge to 'next' soon.
48
+
49
+* mg/cvsimport (2010-11-28) 3 commits
50
+ - cvsimport.txt: document the mapping between config and options
51
+ - cvsimport: fix the parsing of uppercase config options
52
+ - cvsimport: partial whitespace cleanup
53
+
54
+I was being lazy and said "Ok" to "cvsimport.capital-r" but luckily other
55
+people injected sanity to the discussion. Weatherbaloon patch sent, but
56
+not queued here.
57
+
58
+* mz/maint-rebase-stat-config (2010-11-09) 1 commit
59
+ - rebase: only show stat if configured to true
60
+
61
+Will merge to 'next' soon.
62
+
63
+* mz/pull-rebase-rebased (2010-11-13) 1 commit
64
+ - Use reflog in 'pull --rebase . foo'
65
+
66
+Will merge to 'next' soon.
67
+
68
+* nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit
69
+ - entry.c: remove "checkout-index" from error messages
70
+
71
+Will merge to 'next' soon.
72
+
73
+* tf/commit-list-prefix (2010-11-26) 1 commit
74
+ - commit: Add commit_list prefix in two function names.
75
+
76
+* gb/web--browse (2010-12-03) 4 commits
77
+ - web--browse: better support for chromium
78
+ - web--browse: support opera, seamonkey and elinks
79
+ - web--browse: split valid_tool list
80
+ - web--browse: coding style
81
+
82
+Will merge to 'next' soon. The remainder of the series, which is mostly
83
+Debian specific addition, can wait (or just left for the distro).
84
+
85
+* ja/maint-pull-rebase-doc (2010-12-03) 1 commit
86
+ - git-pull.txt: Mention branch.autosetuprebase
87
+
88
+Will merge to 'next'.
89
+
90
+* js/configurable-tab (2010-11-30) 2 commits
91
+ - Make the tab width used for whitespace checks configurable
92
+ - Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD
93
+ (this branch uses js/maint-apply-tab-in-indent-fix.)
94
+
95
+Will merge to 'next'.
96
+
97
+* js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit
98
+ - apply --whitespace=fix: fix tab-in-indent
99
+ (this branch is used by js/configurable-tab.)
100
+
101
+Will merge to 'next'.
102
+
103
+* pd/bash-4-completion (2010-12-01) 2 commits
104
+ - Use the new functions to get the current cword.
105
+ - Introduce functions from bash-completion project.
106
+
107
+There is a "here is a better way to do this" from Jonathan, still in
108
+flight.
109
+
110
+--------------------------------------------------
111
+[Graduated to "master"]
112
+
113
+* ak/apply-non-git-epoch (2010-09-29) 2 commits
114
+ (merged to 'next' on 2010-11-17 at a00579c)
115
+ + apply: handle patches with funny filename and colon in timezone
116
+ + apply: Recognize epoch timestamps with : in the timezone
117
+
118
+* cb/leading-path-removal (2010-11-15) 6 commits
119
+ (merged to 'next' on 2010-11-17 at ec7d709)
120
+ + use persistent memory for rejected paths
121
+ (merged to 'next' on 2010-11-05 at 55ea322)
122
+ + do not overwrite files in leading path
123
+ + lstat_cache: optionally return match_len
124
+ + add function check_ok_to_remove()
125
+ + t7607: add leading-path tests
126
+ + t7607: use test-lib functions and check MERGE_HEAD
127
+
128
+* cm/diff-check-at-eol (2010-10-10) 1 commit
129
+ (merged to 'next' on 2010-11-17 at ad7005a)
130
+ + diff --check: correct line numbers of new blank lines at EOF
131
+
132
+* en/merge-recursive (2010-11-08) 40 commits
133
+ (merged to 'next' on 2010-11-17 at 1b6f865)
134
+ + t6022: Use -eq not = to test output of wc -l
135
+ (merged to 'next' on 2010-11-05 at 16902eb)
136
+ + merge-recursive:make_room_for_directories - work around dumb compilers
137
+ + merge-recursive: Remove redundant path clearing for D/F conflicts
138
+ + merge-recursive: Make room for directories in D/F conflicts
139
+ + handle_delete_modify(): Check whether D/F conflicts are still present
140
+ + merge_content(): Check whether D/F conflicts are still present
141
+ + conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
142
+ + conflict_rename_delete(): Check whether D/F conflicts are still present
143
+ + merge-recursive: Delay modify/delete conflicts if D/F conflict present
144
+ + merge-recursive: Delay content merging for renames
145
+ + merge-recursive: Delay handling of rename/delete conflicts
146
+ + merge-recursive: Move handling of double rename of one file to other file
147
+ + merge-recursive: Move handling of double rename of one file to two
148
+ + merge-recursive: Avoid doubly merging rename/add conflict contents
149
+ + merge-recursive: Update merge_content() call signature
150
+ + merge-recursive: Update conflict_rename_rename_1to2() call signature
151
+ + merge-recursive: Structure process_df_entry() to handle more cases
152
+ + merge-recursive: Have process_entry() skip D/F or rename entries
153
+ + merge-recursive: New function to assist resolving renames in-core only
154
+ + merge-recursive: New data structures for deferring of D/F conflicts
155
+ + merge-recursive: Move process_entry's content merging into a function
156
+ + merge-recursive: Move delete/modify handling into dedicated function
157
+ + merge-recursive: Move rename/delete handling into dedicated function
158
+ + merge-recursive: Nuke rename/directory conflict detection
159
+ + merge-recursive: Rename conflict_rename_rename*() for clarity
160
+ + merge-recursive: Small code clarification -- variable name and comments
161
+ + t6036: Add testcase for undetected conflict
162
+ + t6036: Add a second testcase similar to the first but with content changes
163
+ + t6036: Test index and worktree state, not just that merge fails
164
+ + t6020: Add a testcase for modify/delete + directory/file conflict
165
+ + t6020: Modernize style a bit
166
+ + t6022: Add tests for rename/rename combined with D/F conflicts
167
+ + t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
168
+ + t6022: Add tests with both rename source & dest involved in D/F conflicts
169
+ + t6022: Add tests for reversing order of merges when D/F conflicts present
170
+ + t6022: Add test combinations of {content conflict?, D/F conflict remains?}
171
+ + t6032: Add a test checking for excessive output from merge
172
+ + merge-recursive: Restructure showing how to chain more process_* functions
173
+ + t3030: Add a testcase for resolvable rename/add conflict with symlinks
174
+ + Merge branch 'en/rename-d-f' into en/merge-recursive
175
+ (this branch uses en/rename-d-f.)
176
+
177
+* en/rename-d-f (2010-09-08) 2 commits
178
+ + merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
179
+ + t3509: Add rename + D/F conflict testcase that recursive strategy fails
180
+ (this branch is used by en/merge-recursive.)
181
+
182
+* fc/apply-p2-get-header-name (2010-10-21) 2 commits
183
+ (merged to 'next' on 2010-11-17 at 05a8e94)
184
+ + test: git-apply -p2 rename/chmod only
185
+ + Fix git-apply with -p greater than 1
186
+
187
+* jc/abbrev-guard (2010-10-28) 1 commit
188
+ (merged to 'next' on 2010-11-24 at f26c943)
189
+ + core.abbrevguard: Ensure short object names stay unique a bit longer
190
+
191
+* jc/emfile (2010-10-28) 2 commits
192
+ (merged to 'next' on 2010-11-17 at dac1bc6)
193
+ + A loose object is not corrupt if it cannot be read due to EMFILE
194
+ + read_sha1_file(): report correct name of packfile with a corrupt object
195
+ (this branch is used by sp/emfile.)
196
+
197
+* jj/icase-directory (2010-10-03) 8 commits
198
+ (merged to 'next' on 2010-11-24 at 0da9385)
199
+ + Support case folding in git fast-import when core.ignorecase=true
200
+ + Support case folding for git add when core.ignorecase=true
201
+ + Add case insensitivity support when using git ls-files
202
+ + Add case insensitivity support for directories when using git status
203
+ + Case insensitivity support for .gitignore via core.ignorecase
204
+ + Add string comparison functions that respect the ignore_case variable.
205
+ + Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
206
+ + Makefile & configure: add a NO_FNMATCH flag
207
+
208
+* jl/add-p-reverse-message (2010-10-27) 1 commit
209
+ (merged to 'next' on 2010-11-17 at db2ce14)
210
+ + Correct help blurb in checkout -p and friends
211
+
212
+* jl/clone-recurse-sm-synonym (2010-11-04) 1 commit
213
+ (merged to 'next' on 2010-11-17 at 8c326c2)
214
+ + clone: Add the --recurse-submodules option as alias for --recursive
215
+
216
+* jn/cherry-pick-refresh-index (2010-10-31) 1 commit
217
+ (merged to 'next' on 2010-11-17 at 75e9103)
218
+ + cherry-pick/revert: transparently refresh index
219
+
220
+* jn/fast-import-fix (2010-10-20) 4 commits
221
+ (merged to 'next' on 2010-11-17 at ef3b791)
222
+ + fast-import: do not clear notes in do_change_note_fanout()
223
+ + t9300 (fast-import): another test for the "replace root" feature
224
+ + fast-import: tighten M 040000 syntax
225
+ + fast-import: filemodify after M 040000 <tree> "" crashes
226
+
227
+* jn/ignore-doc (2010-11-10) 2 commits
228
+ (merged to 'next' on 2010-11-24 at c0a9730)
229
+ + Documentation: point to related commands from gitignore
230
+ + Documentation: split gitignore page into sections
231
+
232
+* jn/thinner-wrapper (2010-11-06) 7 commits
233
+ (merged to 'next' on 2010-11-24 at 3f2227d)
234
+ + Remove pack file handling dependency from wrapper.o
235
+ + pack-objects: mark file-local variable static
236
+ + wrapper: give zlib wrappers their own translation unit
237
+ + strbuf: move strbuf_branchname to sha1_name.c
238
+ + path helpers: move git_mkstemp* to wrapper.c
239
+ + wrapper: move odb_* to environment.c
240
+ + wrapper: move xmmap() to sha1_file.c
241
+
242
+* js/configuable-tab (2010-11-29) 1 commit
243
+ - Make the tab width used for whitespace checks configurable
244
+
245
+* kb/blame-author-email (2010-10-15) 1 commit
246
+ (merged to 'next' on 2010-11-17 at 6fd6a2f)
247
+ + blame: Add option to show author email instead of name
248
+
249
+* kb/maint-status-cquote (2010-11-08) 1 commit
250
+ (merged to 'next' on 2010-11-24 at e15b73d)
251
+ + status: Quote paths with spaces in short format
252
+
253
+* md/interix (2010-10-27) 2 commits
254
+ (merged to 'next' on 2010-11-17 at 2a8b562)
255
+ + Interix: add configure checks
256
+ + add support for the SUA layer (interix; windows)
257
+
258
+* np/diff-in-corrupt-repository (2010-10-22) 1 commit
259
+ (merged to 'next' on 2010-11-17 at b57a6cb)
260
+ + diff: don't presume empty file when corresponding object is missing
261
+
262
+* np/pack-broken-boundary (2010-10-22) 1 commit
263
+ (merged to 'next' on 2010-11-17 at 69a9f46)
264
+ + make pack-objects a bit more resilient to repo corruption
265
+
266
+* pn/commit-autosquash (2010-11-02) 6 commits
267
+ (merged to 'next' on 2010-11-24 at acc9c78)
268
+ + add tests of commit --squash
269
+ + commit: --squash option for use with rebase --autosquash
270
+ + add tests of commit --fixup
271
+ + commit: --fixup option for use with rebase --autosquash
272
+ + pretty.c: teach format_commit_message() to reencode the output
273
+ + commit: helper methods to reduce redundant blocks of code
274
+
275
+* rr/needs-clean-work-tree (2010-10-19) 1 commit
276
+ (merged to 'next' on 2010-11-17 at b8aee21)
277
+ + Porcelain scripts: Rewrite cryptic "needs update" error message
278
+
279
+* sn/diff-doc (2010-11-04) 3 commits
280
+ (merged to 'next' on 2010-11-24 at 77190a5)
281
+ + docs: clarify git diff modes of operation
282
+ + diff,difftool: Don't use the {0,2} notation in usage strings
283
+ + CodingGuidelines: Add a section on writing documentation
284
+
285
+* sp/emfile (2010-11-01) 2 commits
286
+ (merged to 'next' on 2010-11-24 at f46d2ce)
287
+ + Work around EMFILE when there are too many pack files
288
+ + Use git_open_noatime when accessing pack data
289
+
290
+* tc/smart-http-post-redirect (2010-09-25) 1 commit
291
+ (merged to 'next' on 2010-11-17 at 6478f7f)
292
+ + smart-http: Don't change POST to GET when following redirect
293
+
294
+--------------------------------------------------
295
+[Stalled]
296
+
297
+* nd/index-doc (2010-09-06) 1 commit
298
+ - doc: technical details about the index file format
299
+
300
+Half-written but it is a good start. I may need to give some help in
301
+describing more recent index extensions.
302
+
303
+* cb/ignored-paths-are-precious (2010-08-21) 1 commit
304
+ - checkout/merge: optionally fail operation when ignored files need to be overwritten
305
+
306
+This needs tests; also we know of longstanding bugs in related area that
307
+needs to be addressed---they do not have to be part of this series but
308
+their reproduction recipe would belong to the test script for this topic.
309
+
310
+It would hurt users to make the new feature on by default, especially the
311
+ones with subdirectories that come and go.
312
+
313
+* jk/tag-contains (2010-07-05) 4 commits
314
+ - Why is "git tag --contains" so slow?
315
+ - default core.clockskew variable to one day
316
+ - limit "contains" traversals based on commit timestamp
317
+ - tag: speed up --contains calculation
318
+
319
+The idea of the bottom one is probably Ok, except that the use of object
320
+flags needs to be rethought, or at least the helper needs to be moved to
321
+builtin/tag.c to make it clear that it should not be used outside the
322
+current usage context.
323
+
324
+* tr/config-doc (2010-10-24) 2 commits
325
+ . Documentation: complete config list from other manpages
326
+ . Documentation: Move variables from config.txt to separate file
327
+
328
+This unfortunately heavily conflicts with patches in flight...
329
+
330
+--------------------------------------------------
331
+[Cooking]
332
+
333
* ef/win32-dirent (2010-11-23) 6 commits
334
- win32: use our own dirent.h
335
- msvc: opendir: handle paths ending with a slash
@@ -22,21 +338,31 @@ still holding onto them.
338
- msvc: opendir: allocate enough memory
339
- msvc: opendir: fix malloc-failure
340
341
+Will merge to 'next' soon.
342
+
343
* jk/asciidoc-update (2010-11-19) 1 commit
344
- docs: default to more modern toolset
345
346
+Will merge to 'next' soon.
347
+
348
* jk/maint-reflog-bottom (2010-11-21) 1 commit
349
- reflogs: clear flags properly in corner case
350
351
+Will merge to 'next' soon.
352
+
353
* jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit
354
- fast-import: treat SIGUSR1 as a request to access objects early
355
356
* jn/maint-fast-import-object-reuse (2010-11-23) 1 commit
357
- fast-import: insert new object entries at start of hash bucket
358
359
+Will merge to 'next' soon.
360
+
361
* jn/maint-svn-fe (2010-10-10) 1 commit
362
- t9010 (svn-fe): Eliminate dependency on svn perl bindings
363
364
+Will merge to 'next' soon.
365
+
366
* jn/svn-fe (2010-11-19) 17 commits
367
- vcs-svn: Implement Prop-delta handling
368
- vcs-svn: Sharpen parsing of property lines
@@ -64,155 +390,31 @@ Some RFC patches, to give them early and wider exposure.
390
* mz/rebase-i-verify (2010-11-22) 1 commit
391
- rebase: support --verify
392
393
+Will merge to 'next' soon.
394
+
395
* nd/maint-relative (2010-11-20) 1 commit
396
- get_cwd_relative(): do not misinterpret root path
397
398
+Will merge to 'next' soon.
399
+
400
* tc/format-patch-p (2010-11-23) 1 commit
401
- format-patch: page output with --stdout
402
73
-* tc/http-urls-ends-with-slash (2010-11-22) 7 commits
403
+I am indifferent/uninterested; I don't see anything wrong with it,
404
+though.
405
+
406
+* tc/http-urls-ends-with-slash (2010-11-25) 9 commits
407
+ - http-fetch: rework url handling
408
- http-push: add trailing slash at arg-parse time, instead of later on
409
- http-push: check path length before using it
410
- http-push: Normalise directory names when pushing to some WebDAV servers
411
- http-backend: use end_url_with_slash()
412
- url: add str wrapper for end_url_with_slash()
413
- shift end_url_with_slash() from http.[ch] to url.[ch]
414
+ - t5550-http-fetch: add test for http-fetch
415
- t5550-http-fetch: add missing '&&'
416
82
---------------------------------------------------
83
-[Graduated to "master"]
84
-
85
-* ao/send-email-irt (2010-11-12) 2 commits
86
- (merged to 'next' on 2010-11-15 at 257c77a)
87
- + git-send-email.perl: make initial In-Reply-To apply only to first email
88
- (merged to 'next' on 2010-11-08 at d103166)
89
- + t9001: send-email interation with --in-reply-to and --chain-reply-to
90
-
91
-* cb/maint-orphan-merge-noclobber (2010-11-14) 1 commit
92
- (merged to 'next' on 2010-11-15 at 046c5e5)
93
- + do not overwrite untracked during merge from unborn branch
94
-
95
-* ef/mingw-daemon (2010-11-04) 16 commits
96
- (merged to 'next' on 2010-11-17 at 4a295c7)
97
- + daemon: opt-out on features that require posix
98
- + daemon: make --inetd and --detach incompatible
99
- + daemon: use socklen_t
100
- + mingw: use poll-emulation from gnulib
101
- + mingw: import poll-emulation from gnulib
102
- + daemon: get remote host address from root-process
103
- + Improve the mingw getaddrinfo stub to handle more use cases
104
- + daemon: use full buffered mode for stderr
105
- + daemon: use run-command api for async serving
106
- + mingw: add kill emulation
107
- + mingw: support waitpid with pid > 0 and WNOHANG
108
- + mingw: use real pid
109
- + inet_ntop: fix a couple of old-style decls
110
- + compat: add inet_pton and inet_ntop prototypes
111
- + mingw: implement syslog
112
- + mingw: add network-wrappers for daemon
113
-
114
-* en/and-cascade-tests (2010-10-31) 25 commits
115
- (merged to 'next' on 2010-11-15 at d51ec77)
116
- + t4124 (apply --whitespace): use test_might_fail
117
- + t3404: do not use 'describe' to implement test_cmp_rev
118
- + t3404 (rebase -i): introduce helper to check position of HEAD
119
- + t3404 (rebase -i): move comment to description
120
- + t3404 (rebase -i): unroll test_commit loops
121
- + t3301 (notes): use test_expect_code for clarity
122
- + t1400 (update-ref): use test_must_fail
123
- + t1502 (rev-parse --parseopt): test exit code from "-h"
124
- + t6022 (renaming merge): chain test commands with &&
125
- + test-lib: introduce test_line_count to measure files
126
- + tests: add missing &&, batch 2
127
- + tests: add missing &&
128
- + Introduce sane_unset and use it to ensure proper && chaining
129
- + t7800 (difftool): add missing &&
130
- + t7601 (merge-pull-config): add missing &&
131
- + t7001 (mv): add missing &&
132
- + t6016 (rev-list-graph-simplify-history): add missing &&
133
- + t5602 (clone-remote-exec): add missing &&
134
- + t4026 (color): remove unneeded and unchained command
135
- + t4019 (diff-wserror): add lots of missing &&
136
- + t4202 (log): Replace '<git-command> || :' with test_might_fail
137
- + t4002 (diff-basic): use test_might_fail for commands that might fail
138
- + t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
139
- + t4017 (diff-retval): replace manual exit code check with test_expect_code
140
- + test-lib: make test_expect_code a test command
141
- (this branch is used by jn/git-cmd-h-bypass-setup.)
142
-
143
-* jk/add-e-doc (2010-11-08) 2 commits
144
- (merged to 'next' on 2010-11-15 at e971401)
145
- + docs: give more hints about how "add -e" works
146
- (merged to 'next' on 2010-11-05 at 389fee7)
147
- + docs: give more hints about how "add -e" works
148
-
149
-* kb/maint-rebase-autosquash (2010-11-04) 2 commits
150
- (merged to 'next' on 2010-11-15 at 9b8c830)
151
- + rebase: teach --autosquash to match on sha1 in addition to message
152
- + rebase: better rearranging of fixup!/squash! lines with --autosquash
153
-
154
-* mm/phrase-remote-tracking (2010-11-02) 10 commits
155
- (merged to 'next' on 2010-11-15 at 07d67f4)
156
- + git-branch.txt: mention --set-upstream as a way to change upstream configuration
157
- + user-manual: remote-tracking can be checked out, with detached HEAD
158
- + user-manual.txt: explain better the remote(-tracking) branch terms
159
- + Change incorrect "remote branch" to "remote tracking branch" in C code
160
- + Change incorrect uses of "remote branch" meaning "remote-tracking"
161
- + Change "tracking branch" to "remote-tracking branch"
162
- + everyday.txt: change "tracking branch" to "remote-tracking branch"
163
- + Change remote tracking to remote-tracking in non-trivial places
164
- + Replace "remote tracking" with "remote-tracking"
165
- + Better "Changed but not updated" message in git-status
166
-
167
-* rs/opt-help-text (2010-11-08) 8 commits
168
- (merged to 'next' on 2010-11-15 at 631c222)
169
- + verify-tag: document --verbose
170
- + branch: improve --verbose description
171
- + archive: improve --verbose description
172
- + Describe various forms of "be quiet" using OPT__QUIET
173
- + add OPT__FORCE
174
- + add description parameter to OPT__QUIET
175
- + add description parameter to OPT__DRY_RUN
176
- + add description parameter to OPT__VERBOSE
177
-
178
---------------------------------------------------
179
-[Stalled]
180
-
181
-* nd/index-doc (2010-09-06) 1 commit
182
- - doc: technical details about the index file format
183
-
184
-Half-written but it is a good start. I may need to give some help in
185
-describing more recent index extensions.
186
-
187
-* cb/ignored-paths-are-precious (2010-08-21) 1 commit
188
- - checkout/merge: optionally fail operation when ignored files need to be overwritten
189
-
190
-This needs tests; also we know of longstanding bugs in related area that
191
-needs to be addressed---they do not have to be part of this series but
192
-their reproduction recipe would belong to the test script for this topic.
193
-
194
-It would hurt users to make the new feature on by default, especially the
195
-ones with subdirectories that come and go.
196
-
197
-* jk/tag-contains (2010-07-05) 4 commits
198
- - Why is "git tag --contains" so slow?
199
- - default core.clockskew variable to one day
200
- - limit "contains" traversals based on commit timestamp
201
- - tag: speed up --contains calculation
202
-
203
-The idea of the bottom one is probably Ok, except that the use of object
204
-flags needs to be rethought, or at least the helper needs to be moved to
205
-builtin/tag.c to make it clear that it should not be used outside the
206
-current usage context.
207
-
208
-* tr/config-doc (2010-10-24) 2 commits
209
- . Documentation: complete config list from other manpages
210
- . Documentation: Move variables from config.txt to separate file
211
-
212
-This unfortunately heavily conflicts with patches in flight...
213
-
214
---------------------------------------------------
215
-[Cooking]
417
+Will merge to 'next' soon.
418
419
* gb/gitweb-remote-heads (2010-11-11) 11 commits
420
(merged to 'next' on 2010-11-24 at 6fb4a6f)
@@ -251,84 +453,54 @@ This unfortunately heavily conflicts with patches in flight...
453
(merged to 'next' on 2010-11-24 at 6b91b41)
454
+ gitweb: Time::HiRes is in core for Perl 5.8
455
254
-* jn/ignore-doc (2010-11-10) 2 commits
255
- (merged to 'next' on 2010-11-24 at c0a9730)
256
- + Documentation: point to related commands from gitignore
257
- + Documentation: split gitignore page into sections
258
-
259
-* jn/thinner-wrapper (2010-11-06) 7 commits
260
- (merged to 'next' on 2010-11-24 at 3f2227d)
261
- + Remove pack file handling dependency from wrapper.o
262
- + pack-objects: mark file-local variable static
263
- + wrapper: give zlib wrappers their own translation unit
264
- + strbuf: move strbuf_branchname to sha1_name.c
265
- + path helpers: move git_mkstemp* to wrapper.c
266
- + wrapper: move odb_* to environment.c
267
- + wrapper: move xmmap() to sha1_file.c
268
-
456
* ks/maint-getenv-fix (2010-11-11) 1 commit
457
(merged to 'next' on 2010-11-24 at fa89826)
458
+ setup: make sure git_dir path is in a permanent buffer, getenv(3) case
459
(this branch is used by jn/getenv-poison.)
460
274
-* nd/extended-sha1-relpath (2010-11-11) 2 commits
461
+* nd/extended-sha1-relpath (2010-11-28) 2 commits
462
- get_sha1: support relative path ":path" syntax
463
- Make prefix_path() return char* without const
464
(this branch uses jn/parse-options-extra.)
465
279
-* nd/maint-fix-add-typo-detection (2010-11-11) 1 commit
466
+As jn/parse-options-extra seems to be still rerolled, this needs to stay
467
+outside 'next' waiting for it.
468
+
469
+* nd/maint-fix-add-typo-detection (2010-11-27) 6 commits
470
+ - Revert "excluded_1(): support exclude files in index"
471
+ - unpack-trees: fix sparse checkout's "unable to match directories"
472
+ - unpack-trees: move all skip-worktree checks back to unpack_trees()
473
+ - dir.c: add free_excludes()
474
+ - cache.h: realign and use (1 << x) form for CE_* constants
475
(merged to 'next' on 2010-11-24 at 6832306)
476
+ add: do not rely on dtype being NULL behavior
477
283
-* jh/gitweb-caching (2010-11-01) 4 commits
478
+Will merge to 'next'.
479
+
480
+* jh/gitweb-caching (2010-12-03) 4 commits
481
- gitweb: Minimal testing of gitweb caching
482
- gitweb: File based caching layer (from git.kernel.org)
483
- gitweb: add output buffering and associated functions
484
- gitweb: Prepare for splitting gitweb
485
289
-* jc/abbrev-guard (2010-10-28) 1 commit
290
- (merged to 'next' on 2010-11-24 at f26c943)
291
- + core.abbrevguard: Ensure short object names stay unique a bit longer
292
-
293
-* jc/emfile (2010-10-28) 2 commits
294
- (merged to 'next' on 2010-11-17 at dac1bc6)
295
- + A loose object is not corrupt if it cannot be read due to EMFILE
296
- + read_sha1_file(): report correct name of packfile with a corrupt object
297
- (this branch is used by sp/emfile.)
298
-
299
-* sp/emfile (2010-11-01) 2 commits
300
- (merged to 'next' on 2010-11-24 at f46d2ce)
301
- + Work around EMFILE when there are too many pack files
302
- + Use git_open_noatime when accessing pack data
303
- (this branch uses jc/emfile.)
304
-
305
-* jl/add-p-reverse-message (2010-10-27) 1 commit
306
- (merged to 'next' on 2010-11-17 at db2ce14)
307
- + Correct help blurb in checkout -p and friends
308
-
309
-* jl/clone-recurse-sm-synonym (2010-11-04) 1 commit
310
- (merged to 'next' on 2010-11-17 at 8c326c2)
311
- + clone: Add the --recurse-submodules option as alias for --recursive
486
+Slightly updated.
487
313
-* jn/cherry-pick-refresh-index (2010-10-31) 1 commit
314
- (merged to 'next' on 2010-11-17 at 75e9103)
315
- + cherry-pick/revert: transparently refresh index
316
-
317
-* jn/parse-options-extra (2010-10-24) 4 commits
488
+* jn/parse-options-extra (2010-12-01) 10 commits
489
- update-index: migrate to parse-options API
490
- setup: save prefix (original cwd relative to toplevel) in startup_info
491
- parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
492
- parse-options: allow git commands to invent new option types
493
+ - parse-options: never suppress arghelp if LITERAL_ARGHELP is set
494
+ - parse-options: do not infer PARSE_OPT_NOARG from option type
495
+ - parse-options: sanity check PARSE_OPT_NOARG flag
496
+ - parse-options: move NODASH sanity checks to parse_options_check
497
+ - parse-options: clearer reporting of API misuse
498
+ - parse-options: Don't call parse_options_check() so much
499
(this branch is used by nd/extended-sha1-relpath.)
500
324
-Wait for a reroll from Jonathan (2010-11-09).
325
-
326
-* md/interix (2010-10-27) 2 commits
327
- (merged to 'next' on 2010-11-17 at 2a8b562)
328
- + Interix: add configure checks
329
- + add support for the SUA layer (interix; windows)
501
+Rerolled.
502
331
-* nd/setup (2010-11-11) 47 commits
503
+* nd/setup (2010-11-26) 47 commits
504
- git.txt: correct where --work-tree path is relative to
505
- Revert "Documentation: always respect core.worktree if set"
506
- t0001: test git init when run via an alias
@@ -377,23 +549,7 @@ Wait for a reroll from Jonathan (2010-11-09).
549
- Add t1510 and basic rules that run repo setup
550
- builtins: print setup info if repo is found
551
380
-I have to queue a handful of fixups still in flight.
381
-
382
-* rr/needs-clean-work-tree (2010-10-19) 1 commit
383
- (merged to 'next' on 2010-11-17 at b8aee21)
384
- + Porcelain scripts: Rewrite cryptic "needs update" error message
385
-
386
-Will merge to master soonish.
387
-
388
-* sn/diff-doc (2010-11-04) 3 commits
389
- (merged to 'next' on 2010-11-24 at 77190a5)
390
- + docs: clarify git diff modes of operation
391
- + diff,difftool: Don't use the {0,2} notation in usage strings
392
- + CodingGuidelines: Add a section on writing documentation
393
-
394
-* kb/maint-status-cquote (2010-11-08) 1 commit
395
- (merged to 'next' on 2010-11-24 at e15b73d)
396
- + status: Quote paths with spaces in short format
552
+Rerolled.
553
554
* mg/maint-tag-rfc1991 (2010-11-10) 5 commits
555
(merged to 'next' on 2010-11-24 at 03864ed)
@@ -403,28 +559,12 @@ Will merge to master soonish.
559
+ verify-tag: factor out signature detection
560
+ t/t7004-tag: test handling of rfc1991 signatures
561
406
-* cm/diff-check-at-eol (2010-10-10) 1 commit
407
- (merged to 'next' on 2010-11-17 at ad7005a)
408
- + diff --check: correct line numbers of new blank lines at EOF
409
-
410
-* fc/apply-p2-get-header-name (2010-10-21) 2 commits
411
- (merged to 'next' on 2010-11-17 at 05a8e94)
412
- + test: git-apply -p2 rename/chmod only
413
- + Fix git-apply with -p greater than 1
414
-
562
* jk/diff-CBM (2010-10-21) 1 commit
563
(merged to 'next' on 2010-11-05 at 9d1ec14)
564
+ diff: report bogus input to -C/-M/-B
565
566
Will merge to master soonish.
567
421
-* jn/fast-import-fix (2010-10-20) 4 commits
422
- (merged to 'next' on 2010-11-17 at ef3b791)
423
- + fast-import: do not clear notes in do_change_note_fanout()
424
- + t9300 (fast-import): another test for the "replace root" feature
425
- + fast-import: tighten M 040000 syntax
426
- + fast-import: filemodify after M 040000 <tree> "" crashes
427
-
568
* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits
569
- update-index -h: show usage even with corrupt index
570
- merge -h: show usage even with corrupt index
@@ -434,17 +574,7 @@ Will merge to master soonish.
574
- checkout-index -h: show usage even in an invalid repository
575
- branch -h: show usage even in an invalid repository
576
437
-* kb/blame-author-email (2010-10-15) 1 commit
438
- (merged to 'next' on 2010-11-17 at 6fd6a2f)
439
- + blame: Add option to show author email instead of name
440
-
441
-* np/diff-in-corrupt-repository (2010-10-22) 1 commit
442
- (merged to 'next' on 2010-11-17 at b57a6cb)
443
- + diff: don't presume empty file when corresponding object is missing
444
-
445
-* np/pack-broken-boundary (2010-10-22) 1 commit
446
- (merged to 'next' on 2010-11-17 at 69a9f46)
447
- + make pack-objects a bit more resilient to repo corruption
577
+Will merge to 'next'.
578
579
* yd/dir-rename (2010-10-29) 5 commits
580
- Allow hiding renames of individual files involved in a directory rename.
@@ -455,51 +585,6 @@ Will merge to master soonish.
585
586
Yet to be rerolled.
587
458
-* en/merge-recursive (2010-11-08) 40 commits
459
- (merged to 'next' on 2010-11-17 at 1b6f865)
460
- + t6022: Use -eq not = to test output of wc -l
461
- (merged to 'next' on 2010-11-05 at 16902eb)
462
- + merge-recursive:make_room_for_directories - work around dumb compilers
463
- + merge-recursive: Remove redundant path clearing for D/F conflicts
464
- + merge-recursive: Make room for directories in D/F conflicts
465
- + handle_delete_modify(): Check whether D/F conflicts are still present
466
- + merge_content(): Check whether D/F conflicts are still present
467
- + conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
468
- + conflict_rename_delete(): Check whether D/F conflicts are still present
469
- + merge-recursive: Delay modify/delete conflicts if D/F conflict present
470
- + merge-recursive: Delay content merging for renames
471
- + merge-recursive: Delay handling of rename/delete conflicts
472
- + merge-recursive: Move handling of double rename of one file to other file
473
- + merge-recursive: Move handling of double rename of one file to two
474
- + merge-recursive: Avoid doubly merging rename/add conflict contents
475
- + merge-recursive: Update merge_content() call signature
476
- + merge-recursive: Update conflict_rename_rename_1to2() call signature
477
- + merge-recursive: Structure process_df_entry() to handle more cases
478
- + merge-recursive: Have process_entry() skip D/F or rename entries
479
- + merge-recursive: New function to assist resolving renames in-core only
480
- + merge-recursive: New data structures for deferring of D/F conflicts
481
- + merge-recursive: Move process_entry's content merging into a function
482
- + merge-recursive: Move delete/modify handling into dedicated function
483
- + merge-recursive: Move rename/delete handling into dedicated function
484
- + merge-recursive: Nuke rename/directory conflict detection
485
- + merge-recursive: Rename conflict_rename_rename*() for clarity
486
- + merge-recursive: Small code clarification -- variable name and comments
487
- + t6036: Add testcase for undetected conflict
488
- + t6036: Add a second testcase similar to the first but with content changes
489
- + t6036: Test index and worktree state, not just that merge fails
490
- + t6020: Add a testcase for modify/delete + directory/file conflict
491
- + t6020: Modernize style a bit
492
- + t6022: Add tests for rename/rename combined with D/F conflicts
493
- + t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
494
- + t6022: Add tests with both rename source & dest involved in D/F conflicts
495
- + t6022: Add tests for reversing order of merges when D/F conflicts present
496
- + t6022: Add test combinations of {content conflict?, D/F conflict remains?}
497
- + t6032: Add a test checking for excessive output from merge
498
- + merge-recursive: Restructure showing how to chain more process_* functions
499
- + t3030: Add a testcase for resolvable rename/add conflict with symlinks
500
- + Merge branch 'en/rename-d-f' into en/merge-recursive
501
- (this branch uses en/rename-d-f.)
502
-
588
* il/remote-fd-ext (2010-11-17) 4 commits
589
(merged to 'next' on 2010-11-24 at ef80cf1)
590
+ remote-fd/ext: finishing touches after code review
@@ -508,21 +593,6 @@ Yet to be rerolled.
593
+ git-remote-fd
594
+ Add bidirectional_transfer_loop()
595
511
-* ak/apply-non-git-epoch (2010-09-29) 2 commits
512
- (merged to 'next' on 2010-11-17 at a00579c)
513
- + apply: handle patches with funny filename and colon in timezone
514
- + apply: Recognize epoch timestamps with : in the timezone
515
-
516
-* cb/leading-path-removal (2010-11-15) 6 commits
517
- (merged to 'next' on 2010-11-17 at ec7d709)
518
- + use persistent memory for rejected paths
519
- (merged to 'next' on 2010-11-05 at 55ea322)
520
- + do not overwrite files in leading path
521
- + lstat_cache: optionally return match_len
522
- + add function check_ok_to_remove()
523
- + t7607: add leading-path tests
524
- + t7607: use test-lib functions and check MERGE_HEAD
525
-
596
* jh/notes-merge (2010-11-09) 23 commits
597
(merged to 'next' on 2010-11-24 at 6218115)
598
+ Provide 'git merge --abort' as a synonym to 'git reset --merge'
@@ -549,33 +619,13 @@ Yet to be rerolled.
619
+ (trivial) notes.h: Minor documentation fixes to copy_notes()
620
+ notes.c: Hexify SHA1 in die() message from init_notes()
621
552
-* pn/commit-autosquash (2010-11-02) 6 commits
553
- (merged to 'next' on 2010-11-24 at acc9c78)
554
- + add tests of commit --squash
555
- + commit: --squash option for use with rebase --autosquash
556
- + add tests of commit --fixup
557
- + commit: --fixup option for use with rebase --autosquash
558
- + pretty.c: teach format_commit_message() to reencode the output
559
- + commit: helper methods to reduce redundant blocks of code
560
-
561
-* jj/icase-directory (2010-10-03) 8 commits
562
- (merged to 'next' on 2010-11-24 at 0da9385)
563
- + Support case folding in git fast-import when core.ignorecase=true
564
- + Support case folding for git add when core.ignorecase=true
565
- + Add case insensitivity support when using git ls-files
566
- + Add case insensitivity support for directories when using git status
567
- + Case insensitivity support for .gitignore via core.ignorecase
568
- + Add string comparison functions that respect the ignore_case variable.
569
- + Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
570
- + Makefile & configure: add a NO_FNMATCH flag
571
-
622
* nd/struct-pathspec (2010-09-20) 5 commits
623
- ce_path_match: drop prefix matching in favor of match_pathspec
624
- Convert ce_path_match() to use struct pathspec
625
- tree_entry_interesting: turn to match_pathspec if wildcard is present
626
- pathspec: add tree_recursive_diff parameter
627
- pathspec: mark wildcard pathspecs from the beginning
578
- (this branch uses en/object-list-with-pathspec.)
628
+ (this branch is tangled with en/object-list-with-pathspec.)
629
630
This is related to something I have long been wanting to see happen.
631
Wait Nguyen for another round (2010-11-11).
@@ -589,22 +639,15 @@ Wait Nguyen for another round (2010-11-11).
639
- pathspec: cache string length when initializing pathspec
640
- diff-no-index: use diff_tree_setup_paths()
641
- Add struct pathspec
592
- (this branch is used by nd/struct-pathspec.)
593
-
594
-* tc/smart-http-post-redirect (2010-09-25) 1 commit
595
- (merged to 'next' on 2010-11-17 at 6478f7f)
596
- + smart-http: Don't change POST to GET when following redirect
597
-
598
-* en/rename-d-f (2010-09-08) 2 commits
599
- + merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
600
- + t3509: Add rename + D/F conflict testcase that recursive strategy fails
601
- (this branch is used by en/merge-recursive.)
642
+ (this branch is tangled with nd/struct-pathspec.)
643
644
* jl/fetch-submodule-recursive (2010-11-11) 3 commits
645
- Submodules: Add the "fetchRecurseSubmodules" config option
646
- Add the 'fetch.recurseSubmodules' config setting
647
- fetch/pull: Add the --recurse-submodules option
648
649
+Will merge to 'next' soonish.
650
+
651
* tr/merge-unborn-clobber (2010-08-22) 1 commit
652
- Exhibit merge bug that clobbers index&WT
653