What's cooking (2010/12 #06)
Junio C Hamano committed
Dec 21, 2010 at 16:53 UTC
61045d5f15b4579570be612b85317675dd1c0754
1 file changed
+103
-153
whats-cooking.txt
+103
-153
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2010, #05; Thu, 16)
3
-X-master-at: 1b9743462d9ef3c0e73a3c439de45c0c16b6c938
4
-X-next-at: 987cddb87165104f919f3287f393191042955364
2
+Subject: What's cooking in git.git (Dec 2010, #06; Tue, 21)
3
+X-master-at: 853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3
4
+X-next-at: 8883a0cd5dc07da65afadda4c449e5c028ed63f7
5
6
-What's cooking in git.git (Dec 2010, #05; Thu, 16)
6
+What's cooking in git.git (Dec 2010, #06; Tue, 21)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,144 +11,63 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
+I'd like to merge nd/setup, nd/struct-pathspec, and everything in
15
+tonight's 'next' soon and tag 1.7.4-rc1 but I might be being a bit too
16
+ambitious.
17
--------------------------------------------------
15
-[New Topics]
18
+[Graduated to "master"]
19
+
20
+* jk/maint-decorate-01-bool (2010-12-18) 1 commit
21
+ (merged to 'next' on 2010-12-20 at 72471ca)
22
+ + handle arbitrary ints in git_config_maybe_bool
23
+
24
+* jk/t2107-now-passes (2010-12-18) 1 commit
25
+ (merged to 'next' on 2010-12-20 at c9156b5)
26
+ + t2107: mark passing test as success
27
28
* jn/maint-gitweb-pathinfo-fix (2010-12-14) 1 commit
29
(merged to 'next' on 2010-12-14 at 1af8cca)
30
+ gitweb: Fix handling of whitespace in generated links
31
21
-* rj/maint-difftool-cygwin-workaround (2010-12-14) 1 commit
22
- - difftool: Fix failure on Cygwin
32
+* ks/blame-worktree-textconv-cached (2010-12-18) 2 commits
33
+ (merged to 'next' on 2010-12-20 at 459c940)
34
+ + fill_textconv(): Don't get/put cache if sha1 is not valid
35
+ + t/t8006: Demonstrate blame is broken when cachetextconv is on
36
24
-* rj/maint-test-fixes (2010-12-14) 5 commits
25
- - t9501-*.sh: Fix a test failure on Cygwin
26
- - lib-git-svn.sh: Add check for mis-configured web server variables
27
- - lib-git-svn.sh: Avoid setting web server variables unnecessarily
28
- - t9142: Move call to start_httpd into the setup test
29
- - t3600-rm.sh: Don't pass a non-existent prereq to test #15
37
+* nd/oneline-sha1-name-from-specific-ref (2010-12-15) 4 commits
38
+ (merged to 'next' on 2010-12-20 at 553cf37)
39
+ + get_sha1: handle special case $commit^{/}
40
+ + get_sha1: support $commit^{/regex} syntax
41
+ + get_sha1_oneline: make callers prepare the commit list to traverse
42
+ + get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
43
31
-* rj/test-fixes (2010-12-14) 4 commits
32
- - t4135-*.sh: Skip the "backslash" tests on cygwin
33
- - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
34
- - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
35
- - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
44
+* tc/completion-reflog (2010-12-16) 1 commit
45
+ (merged to 'next' on 2010-12-20 at 2fa91e0)
46
+ + bash completion: add basic support for git-reflog
47
37
-* tr/maint-branch-no-track-head (2010-12-14) 1 commit
38
- - branch: do not attempt to track HEAD implicitly
39
-
40
-Probably needs a re-roll to exclude either (1) any ref outside the
41
-hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs
42
-outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels
43
-safer and saner.
44
-
45
-* by/log-l (2010-12-14) 8 commits
46
- . log -L: implement move/copy detection (-M/-C)
47
- . log -L: add --full-line-diff option
48
- . log -L: add --graph prefix before output
49
- . log -L: support parent rewriting
50
- . Implement line-history search (git log -L)
51
- . Export rewrite_parents() for 'log -L'
52
- . Export three functions from diff.c
53
- . Refactor parse_loc
48
+--------------------------------------------------
49
+[New Topics]
50
55
-Seems to have some bad interactions with nd/struct-pathspec.
51
+* jk/commit-die-on-bogus-ident (2010-12-20) 2 commits
52
+ (merged to 'next' on 2010-12-21 at 7785c31)
53
+ + commit: die before asking to edit the log message
54
+ + ident: die on bogus date format
55
57
-* hv/mingw-fs-funnies (2010-12-14) 5 commits
58
- - mingw_rmdir: set errno=ENOTEMPTY when appropriate
59
- - mingw: add fallback for rmdir in case directory is in use
60
- - mingw: make failures to unlink or move raise a question
61
- - mingw: work around irregular failures of unlink on windows
62
- - mingw: move unlink wrapper to mingw.c
56
+* jc/maint-am-abort-safely (2010-12-21) 1 commit
57
+ (merged to 'next' on 2010-12-21 at 81602bc)
58
+ + am --abort: keep unrelated commits since the last failure and warn
59
60
--------------------------------------------------
65
-[Graduated to "master"]
61
+[Stalled]
62
67
-* aa/status-hilite-branch (2010-12-09) 2 commits
68
- (merged to 'next' on 2010-12-10 at d00551d)
69
- + default color.status.branch to "same as header"
70
- (merged to 'next' on 2010-12-08 at 0291858)
71
- + status: show branchname with a configurable color
72
-
73
-* ak/describe-exact (2010-12-09) 4 commits
74
- (merged to 'next' on 2010-12-10 at 33497db)
75
- + describe: Delay looking up commits until searching for an inexact match
76
- + describe: Store commit_names in a hash table by commit SHA1
77
- + describe: Do not use a flex array in struct commit_name
78
- + describe: Use for_each_rawref
79
-
80
-* jc/maint-no-openssl-build-fix (2010-12-08) 1 commit
81
- (merged to 'next' on 2010-12-08 at e348a87)
82
- + Do not link with -lcrypto under NO_OPENSSL
83
-
84
-* jc/maint-svn-info-test-fix (2010-12-06) 1 commit
85
- (merged to 'next' on 2010-12-08 at f821694)
86
- + t9119: do not compare "Text Last Updated" line from "svn info"
87
-
88
-* jl/fetch-submodule-recursive (2010-12-09) 4 commits
89
- (merged to 'next' on 2010-12-10 at edd0bf0)
90
- + fetch_populated_submodules(): document dynamic allocation
91
- (merged to 'next' on 2010-12-08 at 676c4f5)
92
- + Submodules: Add the "fetchRecurseSubmodules" config option
93
- + Add the 'fetch.recurseSubmodules' config setting
94
- + fetch/pull: Add the --recurse-submodules option
95
-
96
-* jn/fast-import-blob-access (2010-12-13) 6 commits
97
- (merged to 'next' on 2010-12-12 at 7dc56dd)
98
- + t9300: avoid short reads from dd
99
- (merged to 'next' on 2010-12-08 at a42f0b3)
100
- + t9300: remove unnecessary use of /dev/stdin
101
- + fast-import: Allow cat-blob requests at arbitrary points in stream
102
- + fast-import: let importers retrieve blobs
103
- + fast-import: clarify documentation of "feature" command
104
- + fast-import: stricter parsing of integer options
105
-
106
-* jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit
107
- (merged to 'next' on 2010-12-08 at f538396)
108
- + fast-import: treat SIGUSR1 as a request to access objects early
109
-
110
-* jn/maint-fast-import-object-reuse (2010-11-23) 1 commit
111
- (merged to 'next' on 2010-12-08 at 5d29c08)
112
- + fast-import: insert new object entries at start of hash bucket
113
-
114
-* jn/maint-svn-fe (2010-12-08) 4 commits
115
- (merged to 'next' on 2010-12-09 at 98beb7c)
116
- + t9010 fails when no svn is available
117
- (merged to 'next' on 2010-12-08 at e25350b)
118
- + vcs-svn: fix intermittent repo_tree corruption
119
- + treap: make treap_insert return inserted node
120
- + t9010 (svn-fe): Eliminate dependency on svn perl bindings
121
-
122
-* jn/submodule-b-current (2010-12-05) 2 commits
123
- (merged to 'next' on 2010-12-08 at 33423f3)
124
- + git submodule: Remove now obsolete tests before cloning a repo
125
- + git submodule -b ... of current HEAD fails
126
-
127
-* kb/diff-C-M-synonym (2010-11-10) 2 commits
128
- (merged to 'next' on 2010-12-13 at 13fdbdd)
129
- + diff: use "find" instead of "detect" as prefix for long forms of -M and -C
130
- + diff: add --detect-copies-harder as a synonym for --find-copies-harder
131
-
132
-* nd/extended-sha1-relpath (2010-12-09) 3 commits
133
- (merged to 'next' on 2010-12-10 at 0018aa6)
134
- + get_sha1: teach ":$n:<path>" the same relative path logic
135
- (merged to 'next' on 2010-12-08 at 940e5e2)
136
- + get_sha1: support relative path ":path" syntax
137
- + Make prefix_path() return char* without const
138
-
139
-* nd/maint-relative (2010-11-20) 1 commit
140
- (merged to 'next' on 2010-12-10 at 018bc80)
141
- + get_cwd_relative(): do not misinterpret root path
142
-
143
-* rj/msvc-fix (2010-12-04) 4 commits
144
- (merged to 'next' on 2010-12-10 at 7a2c2c6)
145
- + msvc: Fix macro redefinition warnings
146
- + msvc: Fix build by adding missing INTMAX_MAX define
147
- + msvc: git-daemon.exe: Fix linker "unresolved externals" error
148
- + msvc: Fix compilation errors in compat/win32/sys/poll.c
63
+* mg/cvsimport (2010-11-28) 3 commits
64
+ - cvsimport.txt: document the mapping between config and options
65
+ - cvsimport: fix the parsing of uppercase config options
66
+ - cvsimport: partial whitespace cleanup
67
150
---------------------------------------------------
151
-[Stalled]
68
+I was being lazy and said "Ok" to "cvsimport.capital-r" but luckily other
69
+people injected sanity to the discussion. Weatherbaloon patch sent, but
70
+not queued here.
71
72
* nd/index-doc (2010-09-06) 1 commit
73
- doc: technical details about the index file format
@@ -186,35 +105,65 @@ This unfortunately heavily conflicts with patches in flight...
105
--------------------------------------------------
106
[Cooking]
107
189
-* nd/oneline-sha1-name-from-specific-ref (2010-12-13) 3 commits
190
- - get_sha1: support $commit^{/regex} syntax
191
- - get_sha1_oneline: make callers prepare the commit list to traverse
192
- - get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
108
+* rj/maint-difftool-cygwin-workaround (2010-12-14) 1 commit
109
+ (merged to 'next' on 2010-12-21 at 74b9069)
110
+ + difftool: Fix failure on Cygwin
111
194
-This should be more or less ready for 'next'.
112
+* rj/maint-test-fixes (2010-12-14) 5 commits
113
+ (merged to 'next' on 2010-12-21 at 8883a0c)
114
+ + t9501-*.sh: Fix a test failure on Cygwin
115
+ + lib-git-svn.sh: Add check for mis-configured web server variables
116
+ + lib-git-svn.sh: Avoid setting web server variables unnecessarily
117
+ + t9142: Move call to start_httpd into the setup test
118
+ + t3600-rm.sh: Don't pass a non-existent prereq to test #15
119
196
-* mg/cvsimport (2010-11-28) 3 commits
197
- - cvsimport.txt: document the mapping between config and options
198
- - cvsimport: fix the parsing of uppercase config options
199
- - cvsimport: partial whitespace cleanup
120
+* rj/test-fixes (2010-12-14) 4 commits
121
+ - t4135-*.sh: Skip the "backslash" tests on cygwin
122
+ - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
123
+ - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
124
+ - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
125
201
-I was being lazy and said "Ok" to "cvsimport.capital-r" but luckily other
202
-people injected sanity to the discussion. Weatherbaloon patch sent, but
203
-not queued here.
126
+* tr/maint-branch-no-track-head (2010-12-14) 1 commit
127
+ - branch: do not attempt to track HEAD implicitly
128
+
129
+Probably needs a re-roll to exclude either (1) any ref outside the
130
+hierarchies for branches (i.e. refs/{heads,remotes}/), or (2) only refs
131
+outside refs/ hierarchies (e.g. HEAD, ORIG_HEAD, ...). The latter feels
132
+safer and saner.
133
+
134
+* by/log-l (2010-12-14) 8 commits
135
+ . log -L: implement move/copy detection (-M/-C)
136
+ . log -L: add --full-line-diff option
137
+ . log -L: add --graph prefix before output
138
+ . log -L: support parent rewriting
139
+ . Implement line-history search (git log -L)
140
+ . Export rewrite_parents() for 'log -L'
141
+ . Export three functions from diff.c
142
+ . Refactor parse_loc
143
+
144
+Seems to have some bad interactions with nd/struct-pathspec.
145
+
146
+* hv/mingw-fs-funnies (2010-12-14) 5 commits
147
+ - mingw_rmdir: set errno=ENOTEMPTY when appropriate
148
+ - mingw: add fallback for rmdir in case directory is in use
149
+ - mingw: make failures to unlink or move raise a question
150
+ - mingw: work around irregular failures of unlink on windows
151
+ - mingw: move unlink wrapper to mingw.c
152
+
153
+Can somebody remind me what the status of this series is?
154
155
* tf/commit-list-prefix (2010-11-26) 1 commit
206
- - commit: Add commit_list prefix in two function names.
156
+ (merged to 'next' on 2010-12-21 at 16e1351)
157
+ + commit: Add commit_list prefix in two function names.
158
159
This churn already introduced an unnecessary conflict. It is not by
160
itself a biggie, but these things tend to add up.
161
162
* pd/bash-4-completion (2010-12-15) 3 commits
212
- - Merge branch 'master' (early part) into pd/bash-4-completion
213
- - bash: simple reimplementation of _get_comp_words_by_ref
214
- - bash: get --pretty=m<tab> completion to work with bash v4
215
-
216
-Updated by Jonathan; this still has some conflicts around "notes"
217
-completion I tried to resolve near the tip of 'pu'.
163
+ (merged to 'next' on 2010-12-21 at dbf80ff)
164
+ + Merge branch 'master' (early part) into pd/bash-4-completion
165
+ + bash: simple reimplementation of _get_comp_words_by_ref
166
+ + bash: get --pretty=m<tab> completion to work with bash v4
167
168
* jn/svn-fe (2010-12-06) 18 commits
169
- vcs-svn: Allow change nodes for root of tree (/)
@@ -239,11 +188,12 @@ completion I tried to resolve near the tip of 'pu'.
188
Some RFC patches, to give them early and wider exposure.
189
190
* nd/maint-fix-add-typo-detection (2010-11-27) 5 commits
242
- - Revert "excluded_1(): support exclude files in index"
243
- - unpack-trees: fix sparse checkout's "unable to match directories"
244
- - unpack-trees: move all skip-worktree checks back to unpack_trees()
245
- - dir.c: add free_excludes()
246
- - cache.h: realign and use (1 << x) form for CE_* constants
191
+ (merged to 'next' on 2010-12-21 at 87c702b)
192
+ + Revert "excluded_1(): support exclude files in index"
193
+ + unpack-trees: fix sparse checkout's "unable to match directories"
194
+ + unpack-trees: move all skip-worktree checks back to unpack_trees()
195
+ + dir.c: add free_excludes()
196
+ + cache.h: realign and use (1 << x) form for CE_* constants
197
198
* jh/gitweb-caching (2010-12-03) 4 commits
199
. gitweb: Minimal testing of gitweb caching
@@ -340,12 +290,12 @@ Need to re-queue the reroll.
290
* nd/struct-pathspec (2010-12-15) 21 commits
291
- t7810: overlapping pathspecs and depth limit
292
- grep: drop pathspec_matches() in favor of tree_entry_interesting()
343
- - grep: use writable strbuf from caller in grep_tree()
344
- - strbuf: allow "buf" to point to the middle of the allocated buffer
293
+ - grep: use writable strbuf from caller for grep_tree()
294
- grep: use match_pathspec_depth() for cache/worktree grepping
295
- grep: convert to use struct pathspec
296
- Convert ce_path_match() to use match_pathspec_depth()
297
- Convert ce_path_match() to use struct pathspec
298
+ - struct rev_info: convert prune_data to struct pathspec
299
- pathspec: add match_pathspec_depth()
300
- tree_entry_interesting(): optimize wildcard matching when base is matched
301
- tree_entry_interesting(): support wildcard matching