What's cooking (2011/12 #02)
Junio C Hamano committed
Dec 5, 2011 at 20:56 UTC
dc533388fbf1aec50ac372195de3fc3108b11db7
1 file changed
+214
-165
whats-cooking.txt
+214
-165
@@ -1,17 +1,22 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2011, #01; Fri, 2)
3
-X-master-at: 406da7803217998ff6bf5dc69c55b1613556c2f4
4
-X-next-at: 56e79320f3d9b044c380dfebf136584aaa17ac5b
2
+Subject: What's cooking in git.git (Dec 2011, #02; Mon, 5)
3
+X-master-at: 7e02a6c63a183270b726bb21640059ae16fa48ae
4
+X-next-at: 9aa1b8aa9a5d12968b637b29c5a1d307f945171d
5
6
-What's cooking in git.git (Dec 2011, #01; Fri, 2)
6
+What's cooking in git.git (Dec 2011, #02; Mon, 5)
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 'next'.
10
+only in 'pu' (proposed updates) while commits prefixed with '+' are in
11
+'next'.
12
12
-Now that 1.7.8 is tagged, I'll start planning to rewind 'next' by kicking
13
-topics back to 'pu' and/or dropping them, but let's give the new release a
14
-couple of days of calm.
13
+The tip of 'next' will be rewound soonish, kicking a handful of topics
14
+back to 'pu' that are important enough to get them right rather than
15
+piling "oops, that was a mistake" fix-ups in 'next'.
16
+
17
+All of the topics in Stalled section will be purged without prejudice;
18
+owners of respective topics are free to re-submit after addressing the
19
+issues raised during the previous reviews and re-ignite the discussion.
20
21
Here are the repositories that have my integration branches:
22
@@ -41,38 +46,100 @@ The preformatted documentation in HTML and man format are found in:
46
--------------------------------------------------
47
[New Topics]
48
44
-* aw/rebase-i-stop-on-failure-to-amend (2011-11-30) 1 commit
45
- - rebase -i: interrupt rebase when "commit --amend" failed during "reword"
49
+* bc/maint-apply-check-no-patch (2011-12-05) 2 commits
50
+ - builtin/apply.c: report error on failure to recognize input
51
+ - t/t4131-apply-fake-ancestor.sh: fix broken test
52
47
-* jc/split-blob (2011-12-01) 6 commits
48
- . WIP (streaming chunked)
49
- - chunked-object: fallback checkout codepaths
50
- - bulk-checkin: support chunked-object encoding
51
- - bulk-checkin: allow the same data to be multiply hashed
52
- - new representation types in the packstream
53
- - varint-in-pack: refactor varint encoding/decoding
54
- (this branch uses jc/stream-to-pack.)
53
+Will merge to 'next'.
54
56
-* jh/fast-import-notes (2011-11-28) 3 commits
57
- - fast-import: Fix incorrect fanout level when modifying existing notes refs
58
- - t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
59
- - t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
55
+--------------------------------------------------
56
+[Graduated to "master"]
57
61
-* ld/p4-labels-branches (2011-11-30) 4 commits
62
- - git-p4: importing labels should cope with missing owner
63
- - git-p4: add test for p4 labels
64
- - git-p4: cope with labels with empty descriptions
65
- - git-p4: handle p4 branches and labels containing shell chars
58
+* ab/clang-lints (2011-11-06) 2 commits
59
+ (merged to 'next' on 2011-11-13 at a573aec)
60
+ + cast variable in call to free() in builtin/diff.c and submodule.c
61
+ + apply: get rid of useless x < 0 comparison on a size_t type
62
+
63
+* gh/userdiff-matlab (2011-11-15) 1 commit
64
+ (merged to 'next' on 2011-11-18 at 10cd275)
65
+ + Add built-in diff patterns for MATLAB code
66
67
-Retracted?
67
+* jc/maint-pack-object-cycle (2011-11-16) 1 commit
68
+ (merged to 'next' on 2011-11-18 at 3715a81)
69
+ + pack-object: tolerate broken packs that have duplicated objects
70
69
-* tj/maint-imap-send-remove-unused (2011-11-23) 2 commits
70
- - Merge branch 'maint' into tj/imap-send-remove-unused
71
- - imap-send: Remove unused 'use_namespace' variable
71
+Make the client side more robust against bogus pack stream; the problem
72
+was discovered by accident while repacking a clone obtained from somewhat
73
+buggy test server.
74
+
75
+* jc/index-pack-reject-dups (2011-11-16) 1 commit
76
+ (merged to 'next' on 2011-11-18 at 2090221)
77
+ + receive-pack, fetch-pack: reject bogus pack that records objects twice
78
+
79
+And this is the prevention to reject such pack stream in the first place.
80
+
81
+* jk/refresh-porcelain-output (2011-11-18) 3 commits
82
+ (merged to 'next' on 2011-11-18 at 872f25e)
83
+ + refresh_index: make porcelain output more specific
84
+ + refresh_index: rename format variables
85
+ + read-cache: let refresh_cache_ent pass up changed flags
86
+
87
+* mf/curl-select-fdset (2011-11-04) 4 commits
88
+ (merged to 'next' on 2011-11-06 at a49516f)
89
+ + http: drop "local" member from request struct
90
+ + http.c: Rely on select instead of tracking whether data was received
91
+ + http.c: Use timeout suggested by curl instead of fixed 50ms timeout
92
+ + http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
93
+
94
+Reduces unnecessary waits.
95
+
96
+* na/strtoimax (2011-11-05) 3 commits
97
+ (merged to 'next' on 2011-11-14 at b64e1cb)
98
+ + Support sizes >=2G in various config options accepting 'g' sizes.
99
+ + Compatibility: declare strtoimax() under NO_STRTOUMAX
100
+ + Add strtoimax() compatibility function.
101
+
102
+* nd/fsck-progress (2011-11-06) 4 commits
103
+ (merged to 'next' on 2011-11-13 at 8831811)
104
+ + fsck: print progress
105
+ + fsck: avoid reading every object twice
106
+ + verify_packfile(): check as many object as possible in a pack
107
+ + fsck: return error code when verify_pack() goes wrong
108
+
109
+* nd/maint-ignore-exclude (2011-11-28) 1 commit
110
+ + checkout,merge: loosen overwriting untracked file check based on info/exclude
111
+ (this branch is used by nd/ignore-might-be-precious.)
112
+
113
+* nd/misc-cleanups (2011-10-27) 6 commits
114
+ (merged to 'next' on 2011-10-28 at 2527a49)
115
+ + unpack_object_header_buffer(): clear the size field upon error
116
+ + tree_entry_interesting: make use of local pointer "item"
117
+ + tree_entry_interesting(): give meaningful names to return values
118
+ + read_directory_recursive: reduce one indentation level
119
+ + get_tree_entry(): do not call find_tree_entry() on an empty tree
120
+ + tree-walk.c: do not leak internal structure in tree_entry_len()
121
+
122
+* nd/prune-progress (2011-11-07) 3 commits
123
+ (merged to 'next' on 2011-11-13 at c5722ac)
124
+ + reachable: per-object progress
125
+ + prune: handle --progress/no-progress
126
+ + prune: show progress while marking reachable objects
127
+
128
+* vr/git-merge-doc (2011-11-21) 1 commit
129
+ + Show error for 'git merge' with unset merge.defaultToUpstream
130
+
131
+* vr/msvc (2011-10-31) 3 commits
132
+ (merged to 'next' on 2011-11-14 at f46d021)
133
+ + MSVC: Remove unneeded header stubs
134
+ + Compile fix for MSVC: Include <io.h>
135
+ + Compile fix for MSVC: Do not include sys/resources.h
136
137
--------------------------------------------------
138
[Stalled]
139
140
+All of the topics in Stalled section will be discarded soonish (see the
141
+cover).
142
+
143
* hv/submodule-merge-search (2011-10-13) 4 commits
144
- submodule.c: make two functions static
145
- allow multiple calls to submodule merge search for the same path
@@ -82,20 +149,6 @@ Retracted?
149
What the topic aims to achieve may make sense, but the implementation
150
looked somewhat suboptimal.
151
85
-* sg/complete-refs (2011-10-21) 9 commits
86
- (merged to 'next' on 2011-10-26 at d65e2b4)
87
- + completion: remove broken dead code from __git_heads() and __git_tags()
88
- + completion: fast initial completion for config 'remote.*.fetch' value
89
- + completion: improve ls-remote output filtering in __git_refs_remotes()
90
- + completion: query only refs/heads/ in __git_refs_remotes()
91
- + completion: support full refs from remote repositories
92
- + completion: improve ls-remote output filtering in __git_refs()
93
- + completion: make refs completion consistent for local and remote repos
94
- + completion: optimize refs completion
95
- + completion: document __gitcomp()
96
-
97
-Needs an Ack or two from completion folks before going forward.
98
-
152
* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
153
- t5800: point out that deleting branches does not work
154
- t5800: document inability to push new branch with old content
@@ -161,27 +214,68 @@ The tip commit might be loosening things a bit too much.
214
--------------------------------------------------
215
[Cooking]
216
164
-* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
165
- - convert: track state in LF-to-CRLF filter
217
+* sg/complete-refs (2011-10-21) 9 commits
218
+ (merged to 'next' on 2011-10-26 at d65e2b4)
219
+ + completion: remove broken dead code from __git_heads() and __git_tags()
220
+ + completion: fast initial completion for config 'remote.*.fetch' value
221
+ + completion: improve ls-remote output filtering in __git_refs_remotes()
222
+ + completion: query only refs/heads/ in __git_refs_remotes()
223
+ + completion: support full refs from remote repositories
224
+ + completion: improve ls-remote output filtering in __git_refs()
225
+ + completion: make refs completion consistent for local and remote repos
226
+ + completion: optimize refs completion
227
+ + completion: document __gitcomp()
228
167
-Candidate for early next cycle.
229
+Will merge to 'master.
230
169
-* nd/maint-ignore-exclude (2011-11-28) 1 commit
170
- - checkout,merge: loosen overwriting untracked file check based on info/exclude
171
- (this branch is used by nd/ignore-might-be-precious.)
231
+* aw/rebase-i-stop-on-failure-to-amend (2011-11-30) 1 commit
232
+ - rebase -i: interrupt rebase when "commit --amend" failed during "reword"
233
173
-Candidate for early next cycle.
234
+Will merge to 'next'.
235
175
-* vr/git-merge-doc (2011-11-21) 1 commit
176
- - Show error for 'git merge' with unset merge.defaultToUpstream
236
+* jc/split-blob (2011-12-01) 6 commits
237
+ . WIP (streaming chunked)
238
+ - chunked-object: fallback checkout codepaths
239
+ - bulk-checkin: support chunked-object encoding
240
+ - bulk-checkin: allow the same data to be multiply hashed
241
+ - new representation types in the packstream
242
+ - varint-in-pack: refactor varint encoding/decoding
243
+ (this branch uses jc/stream-to-pack.)
244
+
245
+Not ready.
246
+
247
+* jh/fast-import-notes (2011-11-28) 3 commits
248
+ - fast-import: Fix incorrect fanout level when modifying existing notes refs
249
+ - t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
250
+ - t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
251
+
252
+Will merge to 'next'.
253
+
254
+* ld/p4-labels-branches (2011-11-30) 4 commits
255
+ - git-p4: importing labels should cope with missing owner
256
+ - git-p4: add test for p4 labels
257
+ - git-p4: cope with labels with empty descriptions
258
+ - git-p4: handle p4 branches and labels containing shell chars
259
+
260
+I understand this has been retracted---please correct me otherwise.
261
+Will discard, expecting a reroll.
262
178
-Candidate for early next cycle.
263
+* tj/maint-imap-send-remove-unused (2011-11-23) 2 commits
264
+ - Merge branch 'maint' into tj/imap-send-remove-unused
265
+ - imap-send: Remove unused 'use_namespace' variable
266
+
267
+Will merge to 'next'.
268
+
269
+* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
270
+ - convert: track state in LF-to-CRLF filter
271
+
272
+Will merge to 'next' after taking another look.
273
274
* jn/branch-move-to-self (2011-11-28) 2 commits
275
- Allow checkout -B <current-branch> to update the current branch
276
- branch: allow a no-op "branch -M <current-branch> HEAD"
277
184
-Candidate for early next cycle.
278
+Will merge to 'next' after taking another look.
279
280
* jk/credentials (2011-11-28) 20 commits
281
- fixup! 034c066e
@@ -205,14 +299,19 @@ Candidate for early next cycle.
299
- t5550: fix typo
300
- test-lib: add test_config_global variant
301
302
+Expecting a reroll?
303
+
304
* nd/ignore-might-be-precious (2011-11-28) 2 commits
305
- checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
306
- Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
211
- (this branch uses nd/maint-ignore-exclude.)
307
+
308
+Will merge to 'next' after taking another look.
309
310
* jk/upload-archive-use-start-command (2011-11-21) 1 commit
311
- upload-archive: use start_command instead of fork
312
313
+What's the status of this one?
314
+
315
* jk/maint-1.6.2-upload-archive (2011-11-21) 1 commit
316
- archive: don't let remote clients get unreachable commits
317
(this branch is used by jk/maint-upload-archive.)
@@ -221,52 +320,21 @@ Candidate for early next cycle.
320
- Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
321
(this branch uses jk/maint-1.6.2-upload-archive.)
322
224
-* jk/refresh-porcelain-output (2011-11-18) 3 commits
225
- (merged to 'next' on 2011-11-18 at 872f25e)
226
- + refresh_index: make porcelain output more specific
227
- + refresh_index: rename format variables
228
- + read-cache: let refresh_cache_ent pass up changed flags
323
+Will merge to 'next' after taking another look.
324
230
-* ab/enable-i18n (2011-11-18) 1 commit
325
+* ab/enable-i18n (2011-12-05) 2 commits
326
+ - Makefile: Add missing "sparse object" to gettext target-specific rule
327
- i18n: add infrastructure for translating Git with gettext
328
233
-* gh/userdiff-matlab (2011-11-15) 1 commit
234
- (merged to 'next' on 2011-11-18 at 10cd275)
235
- + Add built-in diff patterns for MATLAB code
236
-
237
-* jc/maint-pack-object-cycle (2011-11-16) 1 commit
238
- (merged to 'next' on 2011-11-18 at 3715a81)
239
- + pack-object: tolerate broken packs that have duplicated objects
240
-
241
-Make the client side more robust against bogus pack stream; the problem
242
-was discovered by accident while repacking a clone obtained from somewhat
243
-buggy test server.
244
-
245
-* jc/index-pack-reject-dups (2011-11-16) 1 commit
246
- (merged to 'next' on 2011-11-18 at 2090221)
247
- + receive-pack, fetch-pack: reject bogus pack that records objects twice
248
-
249
-And this is the prevention to reject such pack stream in the first place.
329
+Will merge to 'next' after squashing the two and re-sending to the list
330
+for review comments.
331
251
-* nd/resolve-ref (2011-11-13) 2 commits
252
- (merged to 'next' on 2011-11-18 at 8e17b34)
332
+* nd/resolve-ref (2011-12-05) 2 commits
333
+ (merged to 'next' on 2011-12-05 at cc79e86)
334
+ Copy resolve_ref() return value for longer use
335
+ Convert many resolve_ref() calls to read_ref*() and ref_exists()
336
256
-A fix for an error-reporting codepath that is not a regression, that
257
-turned into a patch that touches many callsite.
258
-
259
-* vr/msvc (2011-10-31) 3 commits
260
- (merged to 'next' on 2011-11-14 at f46d021)
261
- + MSVC: Remove unneeded header stubs
262
- + Compile fix for MSVC: Include <io.h>
263
- + Compile fix for MSVC: Do not include sys/resources.h
264
-
265
-* na/strtoimax (2011-11-05) 3 commits
266
- (merged to 'next' on 2011-11-14 at b64e1cb)
267
- + Support sizes >=2G in various config options accepting 'g' sizes.
268
- + Compatibility: declare strtoimax() under NO_STRTOUMAX
269
- + Add strtoimax() compatibility function.
337
+Will merge to 'master'.
338
339
* jc/signed-commit (2011-11-29) 5 commits
340
- gpg-interface: allow use of a custom GPG binary
@@ -276,8 +344,8 @@ turned into a patch that touches many callsite.
344
- commit: teach --gpg-sign option
345
(this branch uses jc/pull-signed-tag; is tangled with jc/commit-tree-extra.)
346
279
-Rebased on top of jc/pull-signed-tag topic, after reverting the old one
280
-out of 'next'.
347
+Not exactly urgent.
348
+Will concentrate on getting jc/pull-signed-tag in first.
349
350
* jc/pull-signed-tag (2011-11-12) 15 commits
351
(merged to 'next' on 2011-11-14 at 25e8838)
@@ -298,8 +366,10 @@ out of 'next'.
366
+ Split GPG interface into its own helper library
367
(this branch is used by jc/commit-tree-extra and jc/signed-commit.)
368
301
-Further updated to allow "commit --amend" to retain the mergetag
302
-headers. I think this is ready for the cycle after upcoming 1.7.8.
369
+Allow pulling/merging a signed tag instead of a branch tip, and record
370
+the GPG signature in the merge commit for later audit.
371
+
372
+Will merge to 'master'.
373
374
* jc/request-pull-show-head-4 (2011-11-09) 12 commits
375
(merged to 'next' on 2011-11-13 at e473fd2)
@@ -324,27 +394,13 @@ Allow setting "description" for branches and use it to help communications
394
between humans in various workflow elements. It also allows requesting for
395
a signed tag to be pulled and shows the tag message in the generated message.
396
327
-* ab/clang-lints (2011-11-06) 2 commits
328
- (merged to 'next' on 2011-11-13 at a573aec)
329
- + cast variable in call to free() in builtin/diff.c and submodule.c
330
- + apply: get rid of useless x < 0 comparison on a size_t type
397
+Will merge to 'master'.
398
399
* ab/pull-rebase-config (2011-11-07) 1 commit
400
(merged to 'next' on 2011-11-13 at 72bb2d5)
401
+ pull: introduce a pull.rebase option to enable --rebase
402
336
-* nd/fsck-progress (2011-11-06) 4 commits
337
- (merged to 'next' on 2011-11-13 at 8831811)
338
- + fsck: print progress
339
- + fsck: avoid reading every object twice
340
- + verify_packfile(): check as many object as possible in a pack
341
- + fsck: return error code when verify_pack() goes wrong
342
-
343
-* nd/prune-progress (2011-11-07) 3 commits
344
- (merged to 'next' on 2011-11-13 at c5722ac)
345
- + reachable: per-object progress
346
- + prune: handle --progress/no-progress
347
- + prune: show progress while marking reachable objects
403
+Will merge to 'master'.
404
405
* jc/stream-to-pack (2011-12-01) 5 commits
406
- bulk-checkin: replace fast-import based implementation
@@ -360,6 +416,8 @@ move data from worktree to repository is made aware of streaming, just
416
like the checkout codepath that goes the other way, which was done in the
417
previous "large file support" topic in the 1.7.7 cycle.
418
419
+Will merge to 'next'.
420
+
421
* jn/gitweb-side-by-side-diff (2011-10-31) 8 commits
422
- gitweb: Add navigation to select side-by-side diff
423
- gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
@@ -371,48 +429,32 @@ previous "large file support" topic in the 1.7.7 cycle.
429
- gitweb: Refactor diff body line classification
430
431
Replaces a series from Kato Kazuyoshi on the same topic.
374
-
375
-* mf/curl-select-fdset (2011-11-04) 4 commits
376
- (merged to 'next' on 2011-11-06 at a49516f)
377
- + http: drop "local" member from request struct
378
- + http.c: Rely on select instead of tracking whether data was received
379
- + http.c: Use timeout suggested by curl instead of fixed 50ms timeout
380
- + http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping
381
-
382
-Reduces unnecessary waits.
383
-
384
-* nd/misc-cleanups (2011-10-27) 6 commits
385
- (merged to 'next' on 2011-10-28 at 2527a49)
386
- + unpack_object_header_buffer(): clear the size field upon error
387
- + tree_entry_interesting: make use of local pointer "item"
388
- + tree_entry_interesting(): give meaningful names to return values
389
- + read_directory_recursive: reduce one indentation level
390
- + get_tree_entry(): do not call find_tree_entry() on an empty tree
391
- + tree-walk.c: do not leak internal structure in tree_entry_len()
392
-
393
-These are unquestionably good parts taken out of a larger series, so that
394
-we can focus more on the other changes in later rounds of review.
432
+Is this ready for 'next'?
433
434
* rs/allocate-cache-entry-individually (2011-10-26) 2 commits
435
(merged to 'next' on 2011-10-27 at 2e4acd6)
436
+ cache.h: put single NUL at end of struct cache_entry
437
+ read-cache.c: allocate index entries individually
438
401
-* mh/ref-api-3 (2011-11-16) 26 commits
402
- (merged to 'next' on 2011-11-16 at cc76151)
439
+Will merge to 'master'.
440
+
441
+* rr/revert-cherry-pick (2011-10-23) 5 commits
442
+ (merged to 'next' on 2011-10-26 at 27b7496)
443
+ + revert: simplify communicating command-line arguments
444
+ + revert: allow mixed pick and revert instructions
445
+ + revert: make commit subjects in insn sheet optional
446
+ + revert: simplify getting commit subject in format_todo()
447
+ + revert: free msg in format_todo()
448
+
449
+The internals of "git revert/cherry-pick" has been further refactored to
450
+serve as the basis for the sequencer.
451
+
452
+Is this ready for 'master', or should we eject it to 'pu', expecing a
453
+re-roll?
454
+
455
+* mh/ref-api-2 (2011-11-16) 15 commits
456
+ (merged to 'next' on 2011-11-16 at 511457f)
457
+ refs: loosen over-strict "format" check
404
- (merged to 'next' on 2011-10-23 at 92e2d35)
405
- + is_refname_available(): reimplement using do_for_each_ref_in_array()
406
- + names_conflict(): simplify implementation
407
- + names_conflict(): new function, extracted from is_refname_available()
408
- + repack_without_ref(): reimplement using do_for_each_ref_in_array()
409
- + do_for_each_ref_in_array(): new function
410
- + do_for_each_ref(): correctly terminate while processesing extra_refs
411
- + add_ref(): take a (struct ref_entry *) parameter
412
- + create_ref_entry(): extract function from add_ref()
413
- + parse_ref_line(): add a check that the refname is properly formatted
414
- + repack_without_ref(): remove temporary
415
- + Rename another local variable name -> refname
458
(merged to 'next' on 2011-10-19 at cc89f0e)
459
+ resolve_gitlink_ref_recursive(): change to work with struct ref_cache
460
+ Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
@@ -428,22 +470,26 @@ we can focus more on the other changes in later rounds of review.
470
+ refs: rename "refname" variables
471
+ struct ref_entry: document name member
472
+ cache.h: add comments for git_path() and git_path_submodule()
431
- (this branch is tangled with mh/ref-api-2.)
432
-
433
-* rr/revert-cherry-pick (2011-10-23) 5 commits
434
- (merged to 'next' on 2011-10-26 at 27b7496)
435
- + revert: simplify communicating command-line arguments
436
- + revert: allow mixed pick and revert instructions
437
- + revert: make commit subjects in insn sheet optional
438
- + revert: simplify getting commit subject in format_todo()
439
- + revert: free msg in format_todo()
473
+ (this branch is tangled with mh/ref-api-3.)
474
441
-The internals of "git revert/cherry-pick" has been further refactored to
442
-serve as the basis for the sequencer.
475
+Expecting a re-roll; will eject from 'pu' so that the topic can lose the
476
+hot-fix at the tip.
477
444
-* mh/ref-api-2 (2011-11-16) 15 commits
445
- (merged to 'next' on 2011-11-16 at 511457f)
478
+* mh/ref-api-3 (2011-11-16) 26 commits
479
+ (merged to 'next' on 2011-11-16 at cc76151)
480
+ refs: loosen over-strict "format" check
481
+ (merged to 'next' on 2011-10-23 at 92e2d35)
482
+ + is_refname_available(): reimplement using do_for_each_ref_in_array()
483
+ + names_conflict(): simplify implementation
484
+ + names_conflict(): new function, extracted from is_refname_available()
485
+ + repack_without_ref(): reimplement using do_for_each_ref_in_array()
486
+ + do_for_each_ref_in_array(): new function
487
+ + do_for_each_ref(): correctly terminate while processesing extra_refs
488
+ + add_ref(): take a (struct ref_entry *) parameter
489
+ + create_ref_entry(): extract function from add_ref()
490
+ + parse_ref_line(): add a check that the refname is properly formatted
491
+ + repack_without_ref(): remove temporary
492
+ + Rename another local variable name -> refname
493
(merged to 'next' on 2011-10-19 at cc89f0e)
494
+ resolve_gitlink_ref_recursive(): change to work with struct ref_cache
495
+ Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
@@ -459,4 +505,7 @@ serve as the basis for the sequencer.
505
+ refs: rename "refname" variables
506
+ struct ref_entry: document name member
507
+ cache.h: add comments for git_path() and git_path_submodule()
462
- (this branch is tangled with mh/ref-api-3.)
508
+ (this branch is tangled with mh/ref-api-2.)
509
+
510
+Expecting a re-roll; will eject from 'pu' so that the topioc can lose the
511
+hot-fix at the tip.