What's cooking (2011/12 #04)
Junio C Hamano committed
Dec 13, 2011 at 16:54 UTC
ea50f5c260722a4ab04a6126dfd3be9ffb4b0272
1 file changed
+211
-232
whats-cooking.txt
+211
-232
@@ -1,19 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2011, #03; Fri, 9)
3
-X-master-at: 9859a023fef30ffebdd22ad9639c587ac720b8b6
4
-X-next-at: b9cfa4e96be9817e744fb728360e7f37c730d133
2
+Subject: What's cooking in git.git (Dec 2011, #04; Tue, 13)
3
+X-master-at: 73c6b3575bc638b7096ec913bd91193707e2265d
4
+X-next-at: 1fd576a2d00312e74195662cae445c4463ca87e7
5
6
-What's cooking in git.git (Dec 2011, #03; Fri, 9)
6
+What's cooking in git.git (Dec 2011, #04; Tue, 13)
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
-Two of the more important topics slated for 1.7.9 have been merged to
14
-'master'. Let's hope the other ones also will stabilize soonish, so that
15
-we can smoothly close this cycle early.
16
-
13
Here are the repositories that have my integration branches:
14
15
With maint, master, next, pu, todo:
@@ -40,113 +36,170 @@ The preformatted documentation in HTML and man format are found in:
36
https://github.com/gitster/git-{htmldocs,manpages}.git/
37
38
--------------------------------------------------
43
-[Graduated to "master"]
44
-
45
-* ab/pull-rebase-config (2011-11-07) 1 commit
46
- (merged to 'next' on 2011-12-05 at 6d235a4)
47
- + pull: introduce a pull.rebase option to enable --rebase
48
-
49
-* jc/pull-signed-tag (2011-11-12) 15 commits
50
- (merged to 'next' on 2011-12-05 at c949bd1)
51
- + commit-tree: teach -m/-F options to read logs from elsewhere
52
- + commit-tree: update the command line parsing
53
- + commit: teach --amend to carry forward extra headers
54
- + merge: force edit and no-ff mode when merging a tag object
55
- + commit: copy merged signed tags to headers of merge commit
56
- + merge: record tag objects without peeling in MERGE_HEAD
57
- + merge: make usage of commit->util more extensible
58
- + fmt-merge-msg: Add contents of merged tag in the merge message
59
- + fmt-merge-msg: package options into a structure
60
- + fmt-merge-msg: avoid early returns
61
- + refs DWIMmery: use the same rule for both "git fetch" and others
62
- + fetch: allow "git fetch $there v1.0" to fetch a tag
63
- + merge: notice local merging of tags and keep it unwrapped
64
- + fetch: do not store peeled tag object names in FETCH_HEAD
65
- + Split GPG interface into its own helper library
66
- (this branch is used by jc/signed-commit.)
67
-
68
-Allow pulling/merging a signed tag instead of a branch tip, and record
69
-the GPG signature in the merge commit for later audit.
70
-
71
-* jc/request-pull-show-head-4 (2011-11-09) 12 commits
72
- (merged to 'next' on 2011-12-05 at 8f05b45)
73
- + request-pull: use the annotated tag contents
74
- + fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
75
- + environment.c: Fix an sparse "symbol not declared" warning
76
- + builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
77
- + fmt-merge-msg: use branch.$name.description
78
- + request-pull: use the branch description
79
- + request-pull: state what commit to expect
80
- + request-pull: modernize style
81
- + branch: teach --edit-description option
82
- + format-patch: use branch description in cover letter
83
- + branch: add read_branch_desc() helper function
84
- + Merge branch 'bk/ancestry-path' into jc/branch-desc
85
-
86
-Allow setting "description" for branches and use it to help communications
87
-between humans in various workflow elements. It also allows requesting for
88
-a signed tag to be pulled and shows the tag message in the generated message.
89
-
90
-* nd/resolve-ref (2011-12-05) 2 commits
91
- (merged to 'next' on 2011-12-05 at d55637f)
92
- + Copy resolve_ref() return value for longer use
93
- + Convert many resolve_ref() calls to read_ref*() and ref_exists()
94
-
95
-* rs/allocate-cache-entry-individually (2011-10-26) 2 commits
96
- (merged to 'next' on 2011-12-05 at 241e711)
97
- + cache.h: put single NUL at end of struct cache_entry
98
- + read-cache.c: allocate index entries individually
99
-
100
-* sg/complete-refs (2011-10-21) 9 commits
101
- (merged to 'next' on 2011-12-05 at 03e5527)
102
- + completion: remove broken dead code from __git_heads() and __git_tags()
103
- + completion: fast initial completion for config 'remote.*.fetch' value
104
- + completion: improve ls-remote output filtering in __git_refs_remotes()
105
- + completion: query only refs/heads/ in __git_refs_remotes()
106
- + completion: support full refs from remote repositories
107
- + completion: improve ls-remote output filtering in __git_refs()
108
- + completion: make refs completion consistent for local and remote repos
109
- + completion: optimize refs completion
110
- + completion: document __gitcomp()
39
+[New Topics]
40
+
41
+* jk/maint-fetch-status-table (2011-12-09) 1 commit
42
+ (merged to 'next' on 2011-12-09 at 159415e)
43
+ + fetch: create status table using strbuf
44
+
45
+Will merge to 'master'.
46
+
47
+* ci/stripspace-docs (2011-12-12) 1 commit
48
+ (merged to 'next' on 2011-12-13 at 35b2cdf)
49
+ + Update documentation for stripspace
50
+
51
+* jk/maint-mv (2011-12-12) 5 commits
52
+ (merged to 'next' on 2011-12-13 at 58caedb)
53
+ + mv: be quiet about overwriting
54
+ + mv: improve overwrite warning
55
+ + mv: make non-directory destination error more clear
56
+ + mv: honor --verbose flag
57
+ + docs: mention "-k" for both forms of "git mv"
58
+
59
+* jk/maint-snprintf-va-copy (2011-12-12) 1 commit
60
+ (merged to 'next' on 2011-12-13 at d37a7e1)
61
+ + compat/snprintf: don't look at va_list twice
62
+
63
+* jn/maint-sequencer-fixes (2011-12-12) 7 commits
64
+ (merged to 'next' on 2011-12-13 at 5b3950c)
65
+ + revert: stop creating and removing sequencer-old directory
66
+ + Revert "reset: Make reset remove the sequencer state"
67
+ + revert: do not remove state until sequence is finished
68
+ + revert: allow single-pick in the middle of cherry-pick sequence
69
+ + revert: pass around rev-list args in already-parsed form
70
+ + revert: allow cherry-pick --continue to commit before resuming
71
+ + revert: give --continue handling its own function
72
+
73
+* mh/ref-api (2011-12-12) 51 commits
74
+ - repack_without_ref(): call clear_packed_ref_cache()
75
+ - read_packed_refs(): keep track of the directory being worked in
76
+ - is_refname_available(): query only possibly-conflicting references
77
+ - refs: read loose references lazily
78
+ - read_loose_refs(): take a (ref_entry *) as argument
79
+ - struct ref_dir: store a reference to the enclosing ref_cache
80
+ - sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)
81
+ - do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)
82
+ - add_entry(): take (ref_entry *) instead of (ref_dir *)
83
+ - search_ref_dir(): take (ref_entry *) instead of (ref_dir *)
84
+ - find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)
85
+ - add_ref(): take (ref_entry *) instead of (ref_dir *)
86
+ - read_packed_refs(): take (ref_entry *) instead of (ref_dir *)
87
+ - find_ref(): take (ref_entry *) instead of (ref_dir *)
88
+ - is_refname_available(): take (ref_entry *) instead of (ref_dir *)
89
+ - get_loose_refs(): return (ref_entry *) instead of (ref_dir *)
90
+ - get_packed_refs(): return (ref_entry *) instead of (ref_dir *)
91
+ - refs: wrap top-level ref_dirs in ref_entries
92
+ - get_ref_dir(): keep track of the current ref_dir
93
+ - do_for_each_ref(): only iterate over the subtree that was requested
94
+ - refs: sort ref_dirs lazily
95
+ - sort_ref_dir(): do not sort if already sorted
96
+ - refs: store references hierarchically
97
+ - refs.c: rename ref_array -> ref_dir
98
+ - struct ref_entry: nest the value part in a union
99
+ - check_refname_component(): return 0 for zero-length components
100
+ - free_ref_entry(): new function
101
+ - refs.c: reorder definitions more logically
102
+ - is_refname_available(): reimplement using do_for_each_ref_in_array()
103
+ - names_conflict(): simplify implementation
104
+ - names_conflict(): new function, extracted from is_refname_available()
105
+ - repack_without_ref(): reimplement using do_for_each_ref_in_array()
106
+ - do_for_each_ref_in_arrays(): new function
107
+ - do_for_each_ref_in_array(): new function
108
+ - do_for_each_ref(): correctly terminate while processesing extra_refs
109
+ - add_ref(): take a (struct ref_entry *) parameter
110
+ - create_ref_entry(): extract function from add_ref()
111
+ - repack_without_ref(): remove temporary
112
+ - resolve_gitlink_ref_recursive(): change to work with struct ref_cache
113
+ - Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
114
+ - resolve_gitlink_ref(): improve docstring
115
+ - get_ref_dir(): change signature
116
+ - refs: change signatures of get_packed_refs() and get_loose_refs()
117
+ - is_dup_ref(): extract function from sort_ref_array()
118
+ - add_ref(): add docstring
119
+ - parse_ref_line(): add docstring
120
+ - is_refname_available(): remove the "quiet" argument
121
+ - clear_ref_array(): rename from free_ref_array()
122
+ - refs: rename parameters result -> sha1
123
+ - refs: rename "refname" variables
124
+ - struct ref_entry: document name member
125
+
126
+* nd/resolve-ref (2011-12-13) 3 commits
127
+ (merged to 'next' on 2011-12-13 at c7002e9)
128
+ + Rename resolve_ref() to resolve_ref_unsafe()
129
+ + Convert resolve_ref+xstrdup to new resolve_refdup function
130
+ + revert: convert resolve_ref() to read_ref_full()
131
+
132
+* tr/grep-threading (2011-12-12) 3 commits
133
+ - grep: disable threading in non-worktree case
134
+ - grep: enable threading with -p and -W using lazy attribute lookup
135
+ - grep: load funcname patterns for -W
136
+
137
+Will merge to 'next' after taking another look.
138
+
139
+* tr/pty-all (2011-12-12) 3 commits
140
+ - t/lib-terminal: test test-terminal's sanity
141
+ - test-terminal: set output terminals to raw mode
142
+ - test-terminal: give the child an empty stdin TTY
143
+
144
+Will merge to 'next' after taking another look.
145
+
146
+* jc/push-ignore-stale (2011-12-13) 2 commits
147
+ - push: --ignore-stale option
148
+ - set_ref_status_for_push(): use transport-flags abstraction
149
+
150
+* jk/fetch-no-tail-match-refs (2011-12-13) 4 commits
151
+ (merged to 'next' on 2011-12-13 at 805c018)
152
+ + connect.c: drop path_match function
153
+ + fetch-pack: match refs exactly
154
+ + t5500: give fully-qualified refs to fetch-pack
155
+ + drop "match" parameter from get_remote_heads
156
+
157
+* jk/maint-push-over-dav (2011-12-13) 2 commits
158
+ (merged to 'next' on 2011-12-13 at 45e376c)
159
+ + http-push: enable "proactive auth"
160
+ + t5540: test DAV push with authentication
161
162
--------------------------------------------------
113
-[New Topics]
163
+[Cooking]
164
165
* rr/revert-cherry-pick (2011-12-09) 9 commits
116
- - revert: simplify communicating command-line arguments
117
- - revert: report fine-grained error messages from insn parser
118
- - revert: allow mixed pick and revert instructions
119
- - t3510 (cherry-pick-sequencer): remove malformed sheet 2
120
- - t3510 (cherry-pick-sequencer): use exit status
121
- - revert: simplify getting commit subject in format_todo()
122
- - revert: tolerate extra spaces, tabs in insn sheet
123
- - revert: make commit subjects in insn sheet optional
124
- - revert: free msg in format_todo()
125
-
126
-This is not the latest one but the last one posted to the list.
166
+ . revert: simplify communicating command-line arguments
167
+ . revert: report fine-grained error messages from insn parser
168
+ . revert: allow mixed pick and revert instructions
169
+ . t3510 (cherry-pick-sequencer): remove malformed sheet 2
170
+ . t3510 (cherry-pick-sequencer): use exit status
171
+ . revert: simplify getting commit subject in format_todo()
172
+ . revert: tolerate extra spaces, tabs in insn sheet
173
+ . revert: make commit subjects in insn sheet optional
174
+ . revert: free msg in format_todo()
175
+
176
+Ejected for now, to give higher priority to jn/maint-sequencer-fixes
177
+topic.
178
179
* ew/keepalive (2011-12-05) 1 commit
129
- - enable SO_KEEPALIVE for connected TCP sockets
130
-
131
-Comments?
180
+ (merged to 'next' on 2011-12-13 at 1b5d5c4)
181
+ + enable SO_KEEPALIVE for connected TCP sockets
182
133
-* jc/checkout-m-twoway (2011-12-06) 1 commit
183
+* jc/checkout-m-twoway (2011-12-11) 2 commits
184
+ (merged to 'next' on 2011-12-11 at b61057f)
185
+ + Test 'checkout -m -- path'
186
(merged to 'next' on 2011-12-09 at c946009)
187
+ checkout -m: no need to insist on having all 3 stages
188
189
* tr/cache-tree (2011-12-06) 5 commits
138
- - reset: update cache-tree data when appropriate
139
- - commit: write cache-tree data when writing index anyway
140
- - Refactor cache_tree_update idiom from commit
141
- - Test the current state of the cache-tree optimization
142
- - Add test-scrap-cache-tree
143
-
144
-Will merge to 'next' after taking another look.
190
+ (merged to 'next' on 2011-12-13 at e0da64d)
191
+ + reset: update cache-tree data when appropriate
192
+ + commit: write cache-tree data when writing index anyway
193
+ + Refactor cache_tree_update idiom from commit
194
+ + Test the current state of the cache-tree optimization
195
+ + Add test-scrap-cache-tree
196
197
* tr/userdiff-c-returns-pointer (2011-12-06) 1 commit
198
(merged to 'next' on 2011-12-09 at 0b6a092)
199
+ userdiff: allow * between cpp funcname words
200
201
+Will merge to 'master'.
202
+
203
* jc/commit-amend-no-edit (2011-12-08) 5 commits
204
(merged to 'next' on 2011-12-09 at b9cfa4e)
205
+ test: commit --amend should honor --no-edit
@@ -159,27 +212,31 @@ Will merge to 'next' after taking another look.
212
(merged to 'next' on 2011-12-09 at 53eb3b3)
213
+ diff/status: print submodule path when looking for changes fails
214
215
+Will merge to 'master'.
216
+
217
* ks/tag-cleanup (2011-12-09) 1 commit
218
(merged to 'next' on 2011-12-09 at cbea045)
219
+ git-tag: introduce --cleanup option
220
166
-* rr/test-chaining (2011-12-09) 5 commits
167
- - t3040 (subprojects-basic): fix '&&' chaining, modernize style
168
- - t1510 (worktree): fix '&&' chaining
169
- - t3030 (merge-recursive): use test_expect_code
170
- - test: fix '&&' chaining
171
- - t3200 (branch): fix '&&' chaining
221
+Will merge to 'master'.
222
173
-I think Martin's patches to t3401 should also be queued here.
174
-
175
---------------------------------------------------
176
-[Cooking]
223
+* rr/test-chaining (2011-12-11) 7 commits
224
+ (merged to 'next' on 2011-12-13 at b08445e)
225
+ + t3401: use test_commit in setup
226
+ + t3401: modernize style
227
+ + t3040 (subprojects-basic): fix '&&' chaining, modernize style
228
+ + t1510 (worktree): fix '&&' chaining
229
+ + t3030 (merge-recursive): use test_expect_code
230
+ + test: fix '&&' chaining
231
+ + t3200 (branch): fix '&&' chaining
232
233
* bc/maint-apply-check-no-patch (2011-12-05) 2 commits
234
(merged to 'next' on 2011-12-09 at fc780cd)
235
+ builtin/apply.c: report error on failure to recognize input
236
+ t/t4131-apply-fake-ancestor.sh: fix broken test
237
238
+Will merge to 'master'.
239
+
240
* aw/rebase-i-stop-on-failure-to-amend (2011-11-30) 1 commit
241
(merged to 'next' on 2011-12-09 at a117e83)
242
+ rebase -i: interrupt rebase when "commit --amend" failed during "reword"
@@ -203,23 +260,32 @@ needs to learn it to be used remotely.
260
+ t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
261
+ t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
262
206
-Comments?
263
+Will merge to 'master'.
264
265
* tj/maint-imap-send-remove-unused (2011-11-23) 2 commits
266
(merged to 'next' on 2011-12-09 at 877cc11)
267
+ Merge branch 'maint' into tj/imap-send-remove-unused
268
+ imap-send: Remove unused 'use_namespace' variable
269
270
+Will merge to 'master'.
271
+
272
* cn/maint-lf-to-crlf-filter (2011-11-28) 1 commit
273
(merged to 'next' on 2011-12-09 at c374d14)
274
+ convert: track state in LF-to-CRLF filter
275
276
+Will merge to 'master'.
277
+
278
* jn/branch-move-to-self (2011-11-28) 2 commits
279
(merged to 'next' on 2011-12-09 at 7d27260)
280
+ Allow checkout -B <current-branch> to update the current branch
281
+ branch: allow a no-op "branch -M <current-branch> HEAD"
282
222
-* jk/credentials (2011-12-09) 20 commits
283
+Will merge to 'master'.
284
+
285
+* jk/credentials (2011-12-12) 24 commits
286
+ - contrib: add credential helper for OS X Keychain
287
+ - Makefile: OS X has /dev/tty
288
+ - Makefile: linux has /dev/tty
289
- credential: use git_prompt instead of git_getpass
290
- prompt: use git_terminal_prompt
291
- add generic terminal prompt function
@@ -227,27 +293,32 @@ Comments?
293
- move git_getpass to its own source file
294
- imap-send: don't check return value of git_getpass
295
- imap-send: avoid buffer overflow
230
- - t: add test harness for external credential helpers
231
- - credentials: add "store" helper
232
- - strbuf: add strbuf_add*_urlencode
233
- - credentials: add "cache" helper
234
- - docs: end-user documentation for the credential subsystem
235
- - credential: make relevance of http path configurable
236
- - credential: add credential.*.username
237
- - credential: apply helper config
238
- - http: use credential API to get passwords
239
- - credential: add function for parsing url components
240
- - introduce credentials API
241
- - t5550: fix typo
242
- - test-lib: add test_config_global variant
243
-
244
-Looking good.
296
+ (merged to 'next' on 2011-12-12 at 7a6d658)
297
+ + t: add test harness for external credential helpers
298
+ + credentials: add "store" helper
299
+ + strbuf: add strbuf_add*_urlencode
300
+ + Makefile: unix sockets may not available on some platforms
301
+ + credentials: add "cache" helper
302
+ + docs: end-user documentation for the credential subsystem
303
+ + credential: make relevance of http path configurable
304
+ + credential: add credential.*.username
305
+ + credential: apply helper config
306
+ + http: use credential API to get passwords
307
+ + credential: add function for parsing url components
308
+ + introduce credentials API
309
+ + t5550: fix typo
310
+ + test-lib: add test_config_global variant
311
+
312
+Looking good. Probably split the later part into its own topic and
313
+merge the parts already in 'next' to 'master' soonish.
314
315
* nd/ignore-might-be-precious (2011-11-28) 2 commits
316
(merged to 'next' on 2011-12-09 at 1a94553)
317
+ checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
318
+ Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
319
320
+Will merge to 'master'.
321
+
322
* jk/upload-archive-use-start-command (2011-11-21) 1 commit
323
(merged to 'next' on 2011-12-09 at 88cb83a)
324
+ upload-archive: use start_command instead of fork
@@ -261,10 +332,11 @@ Looking good.
332
+ Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive
333
(this branch uses jk/maint-1.6.2-upload-archive.)
334
264
-* ab/enable-i18n (2011-12-05) 1 commit
265
- - i18n: add infrastructure for translating Git with gettext
335
+Will merge to 'master'.
336
267
-Will merge to 'next'.
337
+* ab/enable-i18n (2011-12-05) 1 commit
338
+ (merged to 'next' on 2011-12-13 at 65af8cd)
339
+ + i18n: add infrastructure for translating Git with gettext
340
341
* jc/signed-commit (2011-11-29) 5 commits
342
- gpg-interface: allow use of a custom GPG binary
@@ -291,109 +363,16 @@ like the checkout codepath that goes the other way, which was done in the
363
previous "large file support" topic in the 1.7.7 cycle.
364
365
* jn/gitweb-side-by-side-diff (2011-10-31) 8 commits
294
- - gitweb: Add navigation to select side-by-side diff
295
- - gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
296
- - t9500: Add basic sanity tests for side-by-side diff in gitweb
297
- - t9500: Add test for handling incomplete lines in diff by gitweb
298
- - gitweb: Give side-by-side diff extra CSS styling
299
- - gitweb: Add a feature to show side-by-side diff
300
- - gitweb: Extract formatting of diff chunk header
301
- - gitweb: Refactor diff body line classification
366
+ (merged to 'next' on 2011-12-09 at 7662e58)
367
+ + gitweb: Add navigation to select side-by-side diff
368
+ + gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
369
+ + t9500: Add basic sanity tests for side-by-side diff in gitweb
370
+ + t9500: Add test for handling incomplete lines in diff by gitweb
371
+ + gitweb: Give side-by-side diff extra CSS styling
372
+ + gitweb: Add a feature to show side-by-side diff
373
+ + gitweb: Extract formatting of diff chunk header
374
+ + gitweb: Refactor diff body line classification
375
376
Replaces a series from Kato Kazuyoshi on the same topic.
304
-Is this ready for 'next'?
377
306
---------------------------------------------------
307
-[Discarded]
308
-
309
-* hv/submodule-merge-search (2011-10-13) 4 commits
310
- . submodule.c: make two functions static
311
- . allow multiple calls to submodule merge search for the same path
312
- . push: Don't push a repository with unpushed submodules
313
- . push: teach --recurse-submodules the on-demand option
314
-
315
-* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
316
- . t5800: point out that deleting branches does not work
317
- . t5800: document inability to push new branch with old content
318
-
319
-* sr/fix-fast-export-tips (2011-11-05) 3 commits
320
- . fast-export: output reset command for commandline revs
321
- . fast-export: do not refer to non-existing marks
322
- . t9350: point out that refs are not updated correctly
323
-
324
-* jc/lookup-object-hash (2011-08-11) 6 commits
325
- . object hash: replace linear probing with 4-way cuckoo hashing
326
- . object hash: we know the table size is a power of two
327
- . object hash: next_size() helper for readability
328
- . pack-objects --count-only
329
- . object.c: remove duplicated code for object hashing
330
- . object.c: code movement for readability
331
-
332
-* jc/verbose-checkout (2011-10-16) 2 commits
333
- . checkout -v: give full status output after switching branches
334
- . checkout: move the local changes report to the end
335
-
336
-* eh/grep-scale-to-cpunum (2011-11-05) 1 commit
337
- . grep: detect number of CPUs for thread spawning
338
-
339
-* jc/commit-tree-extra (2011-11-12) 2 commits
340
- . commit-tree: teach -C <extra-commit>
341
- . commit-tree: teach -x <extra>
342
- (this branch uses jc/pull-signed-tag; is tangled with jc/signed-commit.)
343
-
344
-* cb/daemon-permission-errors (2011-10-17) 2 commits
345
- . daemon: report permission denied error to clients
346
- . daemon: add tests
347
-
348
-* ld/p4-labels-branches (2011-11-30) 4 commits
349
- . git-p4: importing labels should cope with missing owner
350
- . git-p4: add test for p4 labels
351
- . git-p4: cope with labels with empty descriptions
352
- . git-p4: handle p4 branches and labels containing shell chars
353
-
354
-* mh/ref-api-2 (2011-11-16) 15 commits
355
- . refs: loosen over-strict "format" check
356
- . resolve_gitlink_ref_recursive(): change to work with struct ref_cache
357
- . Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
358
- . resolve_gitlink_ref(): improve docstring
359
- . get_ref_dir(): change signature
360
- . refs: change signatures of get_packed_refs() and get_loose_refs()
361
- . is_dup_ref(): extract function from sort_ref_array()
362
- . add_ref(): add docstring
363
- . parse_ref_line(): add docstring
364
- . is_refname_available(): remove the "quiet" argument
365
- . clear_ref_array(): rename from free_ref_array()
366
- . refs: rename parameters result -> sha1
367
- . refs: rename "refname" variables
368
- . struct ref_entry: document name member
369
- . cache.h: add comments for git_path() and git_path_submodule()
370
- (this branch is tangled with mh/ref-api-3.)
371
-
372
-* mh/ref-api-3 (2011-11-16) 26 commits
373
- . refs: loosen over-strict "format" check
374
- . is_refname_available(): reimplement using do_for_each_ref_in_array()
375
- . names_conflict(): simplify implementation
376
- . names_conflict(): new function, extracted from is_refname_available()
377
- . repack_without_ref(): reimplement using do_for_each_ref_in_array()
378
- . do_for_each_ref_in_array(): new function
379
- . do_for_each_ref(): correctly terminate while processesing extra_refs
380
- . add_ref(): take a (struct ref_entry *) parameter
381
- . create_ref_entry(): extract function from add_ref()
382
- . parse_ref_line(): add a check that the refname is properly formatted
383
- . repack_without_ref(): remove temporary
384
- . Rename another local variable name -> refname
385
- . resolve_gitlink_ref_recursive(): change to work with struct ref_cache
386
- . Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
387
- . resolve_gitlink_ref(): improve docstring
388
- . get_ref_dir(): change signature
389
- . refs: change signatures of get_packed_refs() and get_loose_refs()
390
- . is_dup_ref(): extract function from sort_ref_array()
391
- . add_ref(): add docstring
392
- . parse_ref_line(): add docstring
393
- . is_refname_available(): remove the "quiet" argument
394
- . clear_ref_array(): rename from free_ref_array()
395
- . refs: rename parameters result -> sha1
396
- . refs: rename "refname" variables
397
- . struct ref_entry: document name member
398
- . cache.h: add comments for git_path() and git_path_submodule()
399
- (this branch is tangled with mh/ref-api-2.)
378
+Will merge to 'master'.