What's cooking (2012/01 #07)
Junio C Hamano committed
Jan 29, 2012 at 15:41 UTC
ba83261ad6efb0ce56aefc3eb99527e8d9091077
1 file changed
+222
-231
whats-cooking.txt
+222
-231
@@ -1,16 +1,19 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2012, #06; Fri, 27)
3
-X-master-at: 828ea97de486c1693d6e4f2c7347acb50235a85d
4
-X-next-at: db81badb8172f91f47582d00408dd94bbe9b4d93
2
+Subject: What's cooking in git.git (Jan 2012, #07; Sun, 29)
3
+X-master-at: 85da4d459bd6fe11189a2ccf560c952b31ed67b2
4
+X-next-at: 001a395be8dff147088b94dda0892c87a949c033
5
6
-What's cooking in git.git (Jan 2012, #06; Fri, 27)
6
+What's cooking in git.git (Jan 2012, #07; Sun, 29)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in
11
'next'.
12
13
-Now 1.7.9 is out, the development cycle for 1.7.10 will start shortly.
13
+As promised in the recent couple of issues of "What's cooking", the first
14
+batch of topics that have been cooking in 'next' are now in 'master'. The
15
+tip of 'next' hasn't been rewound yet, but it soon will after the second
16
+batch of topics graduate.
17
18
Here are the repositories that have my integration branches:
19
@@ -40,60 +43,95 @@ The preformatted documentation in HTML and man format are found in:
43
--------------------------------------------------
44
[New Topics]
45
43
-* jl/submodule-re-add (2012-01-24) 1 commit
44
- (merged to 'next' on 2012-01-26 at 482553e)
45
- + submodule add: fix breakage when re-adding a deep submodule
46
+* bl/gitweb-project-filter (2012-01-29) 2 commits
47
+ - gitweb: place links to parent directories in page header
48
+ - gitweb: add project_filter to limit project list to a subdirectory
49
47
-Low-impact fix to an old issue.
48
-Will merge early in the next cycle.
50
+* rt/completion-branch-edit-desc (2012-01-29) 1 commit
51
+ - completion: --edit-description option for git-branch
52
50
-* jn/svn-fe (2012-01-27) 44 commits
51
- - vcs-svn/svndiff.c: squelch false "unused" warning from gcc
52
- - Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
53
- - vcs-svn: reset first_commit_done in fast_export_init
54
- - Merge branch 'db/text-delta' into svn-fe
55
- - vcs-svn: do not initialize report_buffer twice
56
- - Merge branch 'db/text-delta' into svn-fe
57
- - vcs-svn: avoid hangs from corrupt deltas
58
- - vcs-svn: guard against overflow when computing preimage length
59
- - Merge branch 'db/delta-applier' into db/text-delta
60
- - vcs-svn: implement text-delta handling
61
- - Merge branch 'db/delta-applier' into db/text-delta
62
- - Merge branch 'db/delta-applier' into svn-fe
63
- - vcs-svn: cap number of bytes read from sliding view
64
- - test-svn-fe: split off "test-svn-fe -d" into a separate function
65
- - vcs-svn: let deltas use data from preimage
66
- - vcs-svn: let deltas use data from postimage
67
- - vcs-svn: verify that deltas consume all inline data
68
- - vcs-svn: implement copyfrom_data delta instruction
69
- - vcs-svn: read instructions from deltas
70
- - vcs-svn: read inline data from deltas
71
- - vcs-svn: read the preimage when applying deltas
72
- - vcs-svn: parse svndiff0 window header
73
- - vcs-svn: skeleton of an svn delta parser
74
- - vcs-svn: make buffer_read_binary API more convenient
75
- - vcs-svn: learn to maintain a sliding view of a file
76
- - Makefile: list one vcs-svn/xdiff object or header per line
77
- - Merge branch 'db/svn-fe-code-purge' into svn-fe
78
- - vcs-svn: drop obj_pool
79
- - vcs-svn: drop treap
80
- - vcs-svn: drop string_pool
81
- - vcs-svn: pass paths through to fast-import
82
- - Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
83
- - Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge
84
- - Merge branch 'db/vcs-svn-incremental' into svn-fe
85
- - vcs-svn: avoid using ls command twice
86
- - vcs-svn: use mark from previous import for parent commit
87
- - vcs-svn: handle filenames with dq correctly
88
- - vcs-svn: quote paths correctly for ls command
89
- - vcs-svn: eliminate repo_tree structure
90
- - vcs-svn: add a comment before each commit
91
- - vcs-svn: save marks for imported commits
92
- - vcs-svn: use higher mark numbers for blobs
93
- - vcs-svn: set up channel to read fast-import cat-blob response
94
- - Merge commit 'v1.7.5' into svn-fe
95
-
96
-Will merge early in the next cycle.
53
+--------------------------------------------------
54
+[Graduated to "master"]
55
+
56
+* cb/git-daemon-tests (2012-01-08) 5 commits
57
+ (merged to 'next' on 2012-01-08 at 1db8351)
58
+ + git-daemon tests: wait until daemon is ready
59
+ + git-daemon: produce output when ready
60
+ + git-daemon: add tests
61
+ + dashed externals: kill children on exit
62
+ + run-command: optionally kill children on exit
63
+
64
+* cb/push-quiet (2012-01-08) 3 commits
65
+ (merged to 'next' on 2012-01-20 at 4326dda)
66
+ + t5541: avoid TAP test miscounting
67
+ + fix push --quiet: add 'quiet' capability to receive-pack
68
+ + server_supports(): parse feature list more carefully
69
+
70
+* jc/maint-log-first-parent-pathspec (2012-01-19) 1 commit
71
+ (merged to 'next' on 2012-01-20 at fb2b35f)
72
+ + Making pathspec limited log play nicer with --first-parent
73
+
74
+* jk/parse-object-cached (2012-01-06) 3 commits
75
+ (merged to 'next' on 2012-01-08 at 8c6fa4a)
76
+ + upload-pack: avoid parsing tag destinations
77
+ + upload-pack: avoid parsing objects during ref advertisement
78
+ + parse_object: try internal cache before reading object db
79
+
80
+These are a bit scary changes, but I do think they are worth doing.
81
+
82
+* jl/test-pause (2012-01-17) 1 commit
83
+ (merged to 'next' on 2012-01-20 at ee56335)
84
+ + test-lib: add the test_pause convenience function
85
+
86
+* jn/gitweb-unspecified-action (2012-01-09) 1 commit
87
+ (merged to 'next' on 2012-01-20 at 2b31714)
88
+ + gitweb: Fix actionless dispatch for non-existent objects
89
+
90
+* mh/ref-clone-without-extra-refs (2012-01-17) 4 commits
91
+ (merged to 'next' on 2012-01-20 at 2e9645e)
92
+ + write_remote_refs(): create packed (rather than extra) refs
93
+ + add_packed_ref(): new function in the refs API.
94
+ + ref_array: keep track of whether references are sorted
95
+ + pack_refs(): remove redundant check
96
+
97
+Looked reasonable; will hopefully help making mh/ref-api-rest simpler and
98
+cleaner.
99
+
100
+* nd/clone-single-branch (2012-01-08) 1 commit
101
+ (merged to 'next' on 2012-01-09 at 6c3c759)
102
+ + clone: add --single-branch to fetch only one branch
103
+ (this branch is used by nd/clone-detached.)
104
+
105
+* nd/index-pack-no-recurse (2012-01-16) 3 commits
106
+ (merged to 'next' on 2012-01-20 at d1e964e)
107
+ + index-pack: eliminate unlimited recursion in get_base_data()
108
+ + index-pack: eliminate recursion in find_unresolved_deltas
109
+ + Eliminate recursion in setting/clearing marks in commit list
110
+
111
+* nd/maint-refname-in-hierarchy-check (2012-01-11) 1 commit
112
+ (merged to 'next' on 2012-01-20 at acb5611)
113
+ + Fix incorrect ref namespace check
114
+
115
+* pw/p4-view-updates (2012-01-11) 5 commits
116
+ (merged to 'next' on 2012-01-20 at 8ca2c7b)
117
+ + git-p4: add tests demonstrating spec overlay ambiguities
118
+ + git-p4: adjust test to adhere to stricter useClientSpec
119
+ + git-p4: clarify comment
120
+ + git-p4: fix verbose comment typo
121
+ + git-p4: only a single ... wildcard is supported
122
+
123
+* rs/diff-postimage-in-context (2012-01-06) 1 commit
124
+ (merged to 'next' on 2012-01-09 at 9635032)
125
+ + xdiff: print post-image for common records instead of pre-image
126
+
127
+* sp/smart-http-failure-to-push (2012-01-20) 1 commit
128
+ (merged to 'next' on 2012-01-20 at a892434)
129
+ + remote-curl: Fix push status report when all branches fail
130
+
131
+* tr/maint-mailinfo (2012-01-16) 2 commits
132
+ (merged to 'next' on 2012-01-20 at 278fae1)
133
+ + mailinfo: with -b, keep space after [foo]
134
+ + am: learn passing -b to mailinfo
135
136
--------------------------------------------------
137
[Stalled]
@@ -107,49 +145,6 @@ takers?
145
146
Waiting for a reroll.
147
110
-* mh/ref-api-rest (2011-12-12) 35 commits
111
- . repack_without_ref(): call clear_packed_ref_cache()
112
- . read_packed_refs(): keep track of the directory being worked in
113
- . is_refname_available(): query only possibly-conflicting references
114
- . refs: read loose references lazily
115
- . read_loose_refs(): take a (ref_entry *) as argument
116
- . struct ref_dir: store a reference to the enclosing ref_cache
117
- . sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)
118
- . do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)
119
- . add_entry(): take (ref_entry *) instead of (ref_dir *)
120
- . search_ref_dir(): take (ref_entry *) instead of (ref_dir *)
121
- . find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)
122
- . add_ref(): take (ref_entry *) instead of (ref_dir *)
123
- . read_packed_refs(): take (ref_entry *) instead of (ref_dir *)
124
- . find_ref(): take (ref_entry *) instead of (ref_dir *)
125
- . is_refname_available(): take (ref_entry *) instead of (ref_dir *)
126
- . get_loose_refs(): return (ref_entry *) instead of (ref_dir *)
127
- . get_packed_refs(): return (ref_entry *) instead of (ref_dir *)
128
- . refs: wrap top-level ref_dirs in ref_entries
129
- . get_ref_dir(): keep track of the current ref_dir
130
- . do_for_each_ref(): only iterate over the subtree that was requested
131
- . refs: sort ref_dirs lazily
132
- . sort_ref_dir(): do not sort if already sorted
133
- . refs: store references hierarchically
134
- . refs.c: rename ref_array -> ref_dir
135
- . struct ref_entry: nest the value part in a union
136
- . check_refname_component(): return 0 for zero-length components
137
- . free_ref_entry(): new function
138
- . refs.c: reorder definitions more logically
139
- . is_refname_available(): reimplement using do_for_each_ref_in_array()
140
- . names_conflict(): simplify implementation
141
- . names_conflict(): new function, extracted from is_refname_available()
142
- . repack_without_ref(): reimplement using do_for_each_ref_in_array()
143
- . do_for_each_ref_in_arrays(): new function
144
- . do_for_each_ref_in_array(): new function
145
- . do_for_each_ref(): correctly terminate while processesing extra_refs
146
-
147
-I had to remove this temporarily out of 'pu' as I didn't want to deal with
148
-merge conflicts with the mh/ref-clone-without-extra-refs topic that
149
-removes yet another caller of add_extra_ref() that this series touches.
150
-
151
-Will defer till the next cycle.
152
-
148
* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
149
- fixup! 15eaaf4
150
- git-svn, perl/Git.pm: extend Git::prompt helper for querying users
@@ -174,6 +169,67 @@ Will defer till the next cycle.
169
--------------------------------------------------
170
[Cooking]
171
172
+* jl/submodule-re-add (2012-01-24) 1 commit
173
+ (merged to 'next' on 2012-01-26 at 482553e)
174
+ + submodule add: fix breakage when re-adding a deep submodule
175
+
176
+"git submodule add" forgot to recompute the name to be stored in .gitmodules
177
+when the module was once added to the superproject and already initialized.
178
+
179
+Will merge to 'master' in the second batch.
180
+
181
+* jn/svn-fe (2012-01-27) 44 commits
182
+ (merged to 'next' on 2012-01-29 at 001a395)
183
+ + vcs-svn/svndiff.c: squelch false "unused" warning from gcc
184
+ + Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
185
+ + vcs-svn: reset first_commit_done in fast_export_init
186
+ + Merge branch 'db/text-delta' into svn-fe
187
+ + vcs-svn: do not initialize report_buffer twice
188
+ + Merge branch 'db/text-delta' into svn-fe
189
+ + vcs-svn: avoid hangs from corrupt deltas
190
+ + vcs-svn: guard against overflow when computing preimage length
191
+ + Merge branch 'db/delta-applier' into db/text-delta
192
+ + vcs-svn: implement text-delta handling
193
+ + Merge branch 'db/delta-applier' into db/text-delta
194
+ + Merge branch 'db/delta-applier' into svn-fe
195
+ + vcs-svn: cap number of bytes read from sliding view
196
+ + test-svn-fe: split off "test-svn-fe -d" into a separate function
197
+ + vcs-svn: let deltas use data from preimage
198
+ + vcs-svn: let deltas use data from postimage
199
+ + vcs-svn: verify that deltas consume all inline data
200
+ + vcs-svn: implement copyfrom_data delta instruction
201
+ + vcs-svn: read instructions from deltas
202
+ + vcs-svn: read inline data from deltas
203
+ + vcs-svn: read the preimage when applying deltas
204
+ + vcs-svn: parse svndiff0 window header
205
+ + vcs-svn: skeleton of an svn delta parser
206
+ + vcs-svn: make buffer_read_binary API more convenient
207
+ + vcs-svn: learn to maintain a sliding view of a file
208
+ + Makefile: list one vcs-svn/xdiff object or header per line
209
+ + Merge branch 'db/svn-fe-code-purge' into svn-fe
210
+ + vcs-svn: drop obj_pool
211
+ + vcs-svn: drop treap
212
+ + vcs-svn: drop string_pool
213
+ + vcs-svn: pass paths through to fast-import
214
+ + Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
215
+ + Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge
216
+ + Merge branch 'db/vcs-svn-incremental' into svn-fe
217
+ + vcs-svn: avoid using ls command twice
218
+ + vcs-svn: use mark from previous import for parent commit
219
+ + vcs-svn: handle filenames with dq correctly
220
+ + vcs-svn: quote paths correctly for ls command
221
+ + vcs-svn: eliminate repo_tree structure
222
+ + vcs-svn: add a comment before each commit
223
+ + vcs-svn: save marks for imported commits
224
+ + vcs-svn: use higher mark numbers for blobs
225
+ + vcs-svn: set up channel to read fast-import cat-blob response
226
+ + Merge commit 'v1.7.5' into svn-fe
227
+
228
+"vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support
229
+incremental imports.
230
+
231
+Will merge to 'master' in the second batch.
232
+
233
* jc/split-blob (2012-01-24) 6 commits
234
- chunked-object: streaming checkout
235
- chunked-object: fallback checkout codepaths
@@ -202,31 +258,6 @@ the "bup" fanboys, to come up with a better logic, thinking that giving
258
people an easy target to shoot for, they may be encouraged to help
259
out. The plan is not working :-(.
260
205
-* jl/test-pause (2012-01-17) 1 commit
206
- (merged to 'next' on 2012-01-20 at ee56335)
207
- + test-lib: add the test_pause convenience function
208
-
209
-Looked reasonable.
210
-Will merge early in the next cycle.
211
-
212
-* mh/ref-clone-without-extra-refs (2012-01-17) 4 commits
213
- (merged to 'next' on 2012-01-20 at 2e9645e)
214
- + write_remote_refs(): create packed (rather than extra) refs
215
- + add_packed_ref(): new function in the refs API.
216
- + ref_array: keep track of whether references are sorted
217
- + pack_refs(): remove redundant check
218
-
219
-Looked reasonable; will hopefully help making mh/ref-api-rest simpler and
220
-cleaner.
221
-
222
-Will merge early in the next cycle.
223
-
224
-* mm/zsh-completion-regression-fix (2012-01-17) 1 commit
225
- (merged to 'next' on 2012-01-23 at 7bc2e0a)
226
- + bash-completion: don't add quoted space for ZSH (fix regression)
227
-
228
-Will merge early in the next cycle and deal with any fallout in 'master'.
229
-
261
* ar/i18n-no-gettext (2012-01-27) 4 commits
262
(merged to 'next' on 2012-01-27 at 0ecf258)
263
+ i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
@@ -235,7 +266,7 @@ Will merge early in the next cycle and deal with any fallout in 'master'.
266
+ add a Makefile switch to avoid gettext translation in shell scripts
267
+ git-sh-i18n: restructure the logic to compute gettext.sh scheme
268
238
-Will merge early in the next cycle and deal with any fallout in 'master'.
269
+Will merge to 'master' in the second batch and deal with any fallout in 'master'.
270
271
* da/maint-mergetool-twoway (2012-01-23) 1 commit
272
(merged to 'next' on 2012-01-23 at f927323)
@@ -244,14 +275,7 @@ Will merge early in the next cycle and deal with any fallout in 'master'.
275
Caters to GUI merge backends that cannot merge two files without
276
a base by giving them an empty file as a "pretend" common ancestor.
277
247
-Will merge early in the next cycle and deal with any fallout in 'master'.
248
-
249
-* jc/maint-log-first-parent-pathspec (2012-01-19) 1 commit
250
- (merged to 'next' on 2012-01-20 at fb2b35f)
251
- + Making pathspec limited log play nicer with --first-parent
252
-
253
-A bugfix.
254
-Will merge early in the next cycle.
278
+Will merge to 'master' in the second batch and deal with any fallout in 'master'.
279
280
* ld/git-p4-branches-and-labels (2012-01-20) 5 commits
281
(merged to 'next' on 2012-01-23 at 9020ec4)
@@ -262,7 +286,7 @@ Will merge early in the next cycle.
286
+ git-p4: handle p4 branches and labels containing shell chars
287
(this branch is used by va/git-p4-branch.)
288
265
-Will merge early in the next cycle.
289
+Will merge to 'master' in the second batch.
290
291
* va/git-p4-branch (2012-01-26) 4 commits
292
(merged to 'next' on 2012-01-26 at e67c52a)
@@ -273,28 +297,27 @@ Will merge early in the next cycle.
297
(this branch uses ld/git-p4-branches-and-labels.)
298
299
Rerolled and Acked.
276
-Will merge early in the next cycle.
277
-
278
-* sp/smart-http-failure-to-push (2012-01-20) 1 commit
279
- (merged to 'next' on 2012-01-20 at a892434)
280
- + remote-curl: Fix push status report when all branches fail
281
-
282
-Looked reasonable.
283
-Will merge early in the next cycle.
300
+Will merge to 'master' in the second batch.
301
302
* ks/sort-wildcard-in-makefile (2012-01-22) 1 commit
303
(merged to 'next' on 2012-01-23 at e2e0c1d)
304
+ t/Makefile: Use $(sort ...) explicitly where needed
305
289
-Looked reasonable.
290
-Will merge early in the next cycle.
306
+t/Makefile is adjusted to prevent newer versions of GNU make from running
307
+tests in seemingly random order.
308
+
309
+Will merge to 'master' in the second batch.
310
311
* tr/grep-l-with-decoration (2012-01-23) 1 commit
312
(merged to 'next' on 2012-01-23 at 42b8795)
313
+ grep: fix -l/-L interaction with decoration lines
314
296
-Looked reasonable.
297
-Will merge early in the next cycle.
315
+Using "git grep -l/-L" together with options -W or --break may not make
316
+much sense as the output is to only count the number of hits and there is
317
+no place for file breaks, but the latter options made "-l/-L" to miscount
318
+the hits.
319
+
320
+Will merge to 'master' in the second batch.
321
322
* jc/pull-signed-tag (2012-01-23) 1 commit
323
(merged to 'next' on 2012-01-23 at 4257553)
@@ -312,15 +335,11 @@ humans to keep using the historical behaviour, hence there is no support
335
for configuration variable (e.g. merge.autoedit) that can be set to 'no'.
336
Oh, also I updated the documentation a bit.
337
315
-Will merge early in the next cycle and deal with any fallout in 'master'.
338
+"git merge" in an interactive session learned to spawn the editor by
339
+default to let the user edit the auto-generated merge message, to
340
+encourage people to explain their merges better.
341
317
-* nd/maint-refname-in-hierarchy-check (2012-01-11) 1 commit
318
- (merged to 'next' on 2012-01-20 at acb5611)
319
- + Fix incorrect ref namespace check
320
-
321
-Avoid getting confused by "ref/headxxx" and mistaking it as if it is under
322
-the "refs/heads/" hierarchy.
323
-Will merge early in the next cycle.
342
+Will merge to 'master' in the second batch and deal with any fallout in 'master'.
343
344
* jc/advise-i18n (2011-12-22) 1 commit
345
(merged to 'next' on 2012-01-23 at 6447013)
@@ -332,7 +351,7 @@ interface and not vreportf() in general as touching the latter has
351
interactions with error() that has plumbing callers whose prefix "error: "
352
should never be translated.
353
335
-Will merge early in the next cycle.
354
+Will merge to 'master' in the second batch.
355
356
* rr/sequencer (2012-01-11) 2 commits
357
(merged to 'next' on 2012-01-23 at f349b56)
@@ -342,41 +361,7 @@ Will merge early in the next cycle.
361
Moving large chunk of code out of cherry-pick/revert for later reuse,
362
primarily to prepare for the next cycle.
363
345
-Will merge early in the next cycle.
346
-
347
-* tr/maint-mailinfo (2012-01-16) 2 commits
348
- (merged to 'next' on 2012-01-20 at 278fae1)
349
- + mailinfo: with -b, keep space after [foo]
350
- + am: learn passing -b to mailinfo
351
-
352
-Looked reasonable.
353
-Will merge early in the next cycle.
354
-
355
-* pw/p4-view-updates (2012-01-11) 5 commits
356
- (merged to 'next' on 2012-01-20 at 8ca2c7b)
357
- + git-p4: add tests demonstrating spec overlay ambiguities
358
- + git-p4: adjust test to adhere to stricter useClientSpec
359
- + git-p4: clarify comment
360
- + git-p4: fix verbose comment typo
361
- + git-p4: only a single ... wildcard is supported
362
-
363
-Will merge early in the next cycle.
364
-
365
-* rs/diff-postimage-in-context (2012-01-06) 1 commit
366
- (merged to 'next' on 2012-01-09 at 9635032)
367
- + xdiff: print post-image for common records instead of pre-image
368
-
369
-Looked reasonable.
370
-Will merge early in the next cycle and deal with any fallout in 'master'.
371
-
372
-* cb/push-quiet (2012-01-08) 3 commits
373
- (merged to 'next' on 2012-01-20 at 4326dda)
374
- + t5541: avoid TAP test miscounting
375
- + fix push --quiet: add 'quiet' capability to receive-pack
376
- + server_supports(): parse feature list more carefully
377
-
378
-Looked reasonable.
379
-Will merge early in the next cycle.
364
+Will merge to 'master' in the second batch.
365
366
* nd/clone-detached (2012-01-24) 12 commits
367
(merged to 'next' on 2012-01-26 at 7b0cc8a)
@@ -394,50 +379,56 @@ Will merge early in the next cycle.
379
+ clone: factor out checkout code
380
+ clone: write detached HEAD in bare repositories
381
+ t5601: add missing && cascade
397
- (this branch uses nd/clone-single-branch.)
382
399
-Applied two band-aids to a corner-case regression.
400
-Will merge early in the next cycle and deal with any fallout in 'master'.
383
+"git clone" learned to detach the HEAD in the resulting repository when
384
+the source repository's HEAD does not point to a branch.
385
402
-* nd/clone-single-branch (2012-01-08) 1 commit
403
- (merged to 'next' on 2012-01-09 at 6c3c759)
404
- + clone: add --single-branch to fetch only one branch
405
- (this branch is used by nd/clone-detached.)
406
-
407
-Looked reasonable.
408
-Will merge early in the next cycle.
386
+Will merge to 'master' in the second batch and deal with any fallout in 'master'.
387
410
-* jn/gitweb-unspecified-action (2012-01-09) 1 commit
411
- (merged to 'next' on 2012-01-20 at 2b31714)
412
- + gitweb: Fix actionless dispatch for non-existent objects
413
-
414
-Looked reasonable.
415
-Will merge early in the next cycle.
416
-
417
-* nd/index-pack-no-recurse (2012-01-16) 3 commits
418
- (merged to 'next' on 2012-01-20 at d1e964e)
419
- + index-pack: eliminate unlimited recursion in get_base_data()
420
- + index-pack: eliminate recursion in find_unresolved_deltas
421
- + Eliminate recursion in setting/clearing marks in commit list
422
-
423
-Much better explained than the previous round.
424
-Will merge early in the next cycle and deal with any fallout in 'master'.
388
+--------------------------------------------------
389
+[Discarded]
390
426
-* cb/git-daemon-tests (2012-01-08) 5 commits
427
- (merged to 'next' on 2012-01-08 at 1db8351)
428
- + git-daemon tests: wait until daemon is ready
429
- + git-daemon: produce output when ready
430
- + git-daemon: add tests
431
- + dashed externals: kill children on exit
432
- + run-command: optionally kill children on exit
391
+* mh/ref-api-rest (2011-12-12) 35 commits
392
+ . repack_without_ref(): call clear_packed_ref_cache()
393
+ . read_packed_refs(): keep track of the directory being worked in
394
+ . is_refname_available(): query only possibly-conflicting references
395
+ . refs: read loose references lazily
396
+ . read_loose_refs(): take a (ref_entry *) as argument
397
+ . struct ref_dir: store a reference to the enclosing ref_cache
398
+ . sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)
399
+ . do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)
400
+ . add_entry(): take (ref_entry *) instead of (ref_dir *)
401
+ . search_ref_dir(): take (ref_entry *) instead of (ref_dir *)
402
+ . find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)
403
+ . add_ref(): take (ref_entry *) instead of (ref_dir *)
404
+ . read_packed_refs(): take (ref_entry *) instead of (ref_dir *)
405
+ . find_ref(): take (ref_entry *) instead of (ref_dir *)
406
+ . is_refname_available(): take (ref_entry *) instead of (ref_dir *)
407
+ . get_loose_refs(): return (ref_entry *) instead of (ref_dir *)
408
+ . get_packed_refs(): return (ref_entry *) instead of (ref_dir *)
409
+ . refs: wrap top-level ref_dirs in ref_entries
410
+ . get_ref_dir(): keep track of the current ref_dir
411
+ . do_for_each_ref(): only iterate over the subtree that was requested
412
+ . refs: sort ref_dirs lazily
413
+ . sort_ref_dir(): do not sort if already sorted
414
+ . refs: store references hierarchically
415
+ . refs.c: rename ref_array -> ref_dir
416
+ . struct ref_entry: nest the value part in a union
417
+ . check_refname_component(): return 0 for zero-length components
418
+ . free_ref_entry(): new function
419
+ . refs.c: reorder definitions more logically
420
+ . is_refname_available(): reimplement using do_for_each_ref_in_array()
421
+ . names_conflict(): simplify implementation
422
+ . names_conflict(): new function, extracted from is_refname_available()
423
+ . repack_without_ref(): reimplement using do_for_each_ref_in_array()
424
+ . do_for_each_ref_in_arrays(): new function
425
+ . do_for_each_ref_in_array(): new function
426
+ . do_for_each_ref(): correctly terminate while processesing extra_refs
427
434
-Will merge early in the next cycle.
428
+Will be re-rolled. Discarded without prejudice.
429
436
-* jk/parse-object-cached (2012-01-06) 3 commits
437
- (merged to 'next' on 2012-01-08 at 8c6fa4a)
438
- + upload-pack: avoid parsing tag destinations
439
- + upload-pack: avoid parsing objects during ref advertisement
440
- + parse_object: try internal cache before reading object db
430
+* mm/zsh-completion-regression-fix (2012-01-17) 1 commit
431
+ (merged to 'next' on 2012-01-23 at 7bc2e0a)
432
+ + bash-completion: don't add quoted space for ZSH (fix regression)
433
442
-These are a bit scary changes, but I do think they are worth doing.
443
-Will merge early in the next cycle and deal with any fallout in 'master'.
434
+Superseded by a better fix already in 'master'.