What's cooking (2011/10 #07)
Junio C Hamano committed
Oct 19, 2011 at 14:57 UTC
9c9b3c34c9f4e401d42b6563e6387d8a36f35dd2
1 file changed
+159
-257
whats-cooking.txt
+159
-257
@@ -1,18 +1,17 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2011, #06; Tue, 18)
3
-X-master-at: 08cfdbb88cd6225b4fc4b8a3cecd0e01758c835d
4
-X-next-at: 84fb7e6e14c3124e875b0326d84f1a4347e044d5
2
+Subject: What's cooking in git.git (Oct 2011, #07; Wed, 19)
3
+X-master-at: 87009edcbd0b4987ccb7ba050a1efe368a315753
4
+X-next-at: cbf5e0b121e34b6b879a06938b34acda5e1b509d
5
6
-What's cooking in git.git (Oct 2011, #06; Tue, 18)
6
+What's cooking in git.git (Oct 2011, #07; Wed, 19)
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'.
11
12
-The fourth batch of topics have graduated to the master branch. This batch
13
-ended up to be mostly fixes, as can be seen in the updates in the RelNotes
14
-file. These topics will be further merged down to the maint branch for the
15
-1.7.7.1 maintenance release.
12
+The fifth batch of topics started graduating to the master branch. It is
13
+probably a good point to stop taking new topics and start switching our
14
+focus to fixing bugs in the topics already in 'master'.
15
16
Here are the repositories that have my integration branches:
17
@@ -33,99 +32,69 @@ With all the topics and integration branches but not todo, html or man:
32
https://github.com/gitster/git
33
34
--------------------------------------------------
36
-[Graduated to "master"]
35
+[New Topics]
36
+
37
+* jc/match-refs-clarify (2011-09-12) 2 commits
38
+ - rename "match_refs()" to "match_push_refs()"
39
+ - send-pack: typofix error message
40
38
-* bc/attr-ignore-case (2011-10-11) 5 commits
39
- (merged to 'next' on 2011-10-11 at daa6b51)
40
- + attr.c: respect core.ignorecase when matching attribute patterns
41
- + attr: read core.attributesfile from git_default_core_config
42
- + builtin/mv.c: plug miniscule memory leak
43
- + cleanup: use internal memory allocation wrapper functions everywhere
44
- + attr.c: avoid inappropriate access to strbuf "buf" member
45
-
46
-* ef/mingw-syslog (2011-10-07) 1 commit
47
- (merged to 'next' on 2011-10-11 at d5d6945)
48
- + mingw: avoid using strbuf in syslog
49
-
50
-* jc/checkout-from-tree-keep-local-changes (2011-09-30) 1 commit
51
- (merged to 'next' on 2011-10-06 at 64061aa)
52
- + checkout $tree $path: do not clobber local changes in $path not in $tree
53
-
54
-Originally merged to 'next' on 2011-10-05.
55
-
56
-* jk/config-test-cleanup (2011-10-12) 2 commits
57
- (merged to 'next' on 2011-10-12 at 7c857dd)
58
- + t1300: test mixed-case variable retrieval
59
- + t1300: put git invocations inside test function
60
-
61
-* jk/http-auth (2011-10-15) 6 commits
62
- (merged to 'next' on 2011-10-15 at 2ff0053)
63
- + http_init: accept separate URL parameter
64
- + http: use hostname in credential description
65
- + http: retry authentication failures for all http requests
66
- + remote-curl: don't retry auth failures with dumb protocol
67
- + improve httpd auth tests
68
- + url: decode buffers that are not NUL-terminated
69
- (this branch is tangled with jk/http-auth-keyring and js/cred-macos-x-keychain-2.)
70
-
71
-Michael helped resurrecting uncontentious bits from the credential series.
72
-
73
-* jk/name-hash-dirent (2011-10-07) 1 commit
74
- (merged to 'next' on 2011-10-11 at e2ea68b)
75
- + fix phantom untracked files when core.ignorecase is set
76
-
77
-* jk/pull-rebase-with-work-tree (2011-10-13) 1 commit
78
- (merged to 'next' on 2011-10-15 at 2707482)
79
- + pull,rebase: handle GIT_WORK_TREE better
80
-
81
-* js/bisect-no-checkout (2011-09-21) 1 commit
82
- (merged to 'next' on 2011-10-06 at 0354e94)
83
- + bisect: fix exiting when checkout failed in bisect_start()
84
-
85
-Originally merged to 'next' on 2011-09-21.
86
-
87
-* js/check-ref-format-test-mingw (2011-10-13) 1 commit
88
- (merged to 'next' on 2011-10-15 at fbc2ee6)
89
- + t1402-check-ref-format: skip tests of refs beginning with slash on Windows
90
-
91
-* mm/maint-config-explicit-bool-display (2011-10-10) 1 commit
92
- (merged to 'next' on 2011-10-11 at 795939f)
93
- + config: display key_delim for config --bool --get-regexp
94
-
95
-* ph/push-to-delete-nothing (2011-09-30) 1 commit
96
- (merged to 'next' on 2011-10-06 at 33ac777)
97
- + receive-pack: don't pass non-existent refs to post-{receive,update} hooks
98
-
99
-* sg/completion (2011-10-10) 2 commits
100
- (merged to 'next' on 2011-10-11 at 4724640)
101
- + completion: unite --format and --pretty for 'log' and 'show'
102
- + completion: unite --reuse-message and --reedit-message for 'notes'
103
- (this branch is used by sg/complete-refs; uses tm/completion-commit-fixup-squash.)
104
-
105
-* tc/fetch-leak (2011-10-07) 1 commit
106
- (merged to 'next' on 2011-10-11 at d867153)
107
- + fetch: plug two leaks on error exit in store_updated_refs
108
-
109
-* tm/completion-commit-fixup-squash (2011-10-06) 2 commits
110
- (merged to 'next' on 2011-10-11 at 6bb192e)
111
- + completion: commit --fixup and --squash
112
- + completion: unite --reuse-message and --reedit-message handling
113
- (this branch is used by sg/complete-refs and sg/completion.)
114
-
115
-* tm/completion-push-set-upstream (2011-10-06) 1 commit
116
- (merged to 'next' on 2011-10-11 at 85544e5)
117
- + completion: push --set-upstream
118
- (this branch is used by sg/complete-refs.)
41
+* jn/libperl-git-config (2011-10-18) 1 commit
42
+ - libperl-git: refactor Git::config_*
43
+
44
+* ss/inet-ntop (2011-10-18) 1 commit
45
+ - inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables
46
47
--------------------------------------------------
121
-[New Topics]
48
+[Graduated to "master"]
49
+
50
+* bk/submodule-in-recursive-merge (2011-10-13) 2 commits
51
+ (merged to 'next' on 2011-10-15 at e02205c)
52
+ + submodule: Search for merges only at end of recursive merge
53
+ + submodule: Demonstrate known breakage during recursive merge
54
+
55
+Brad helped resurrecting good bits earlier tangled in the stalled topic
56
+hv/submodule-merge-search by mistake.
57
+
58
+* cb/httpd-test-fix-port (2011-10-17) 1 commit
59
+ (merged to 'next' on 2011-10-17 at 84fb7e6)
60
+ + use test number as port number
61
+
62
+* jm/maint-apply-detects-corrupt-patch-header (2011-10-12) 1 commit
63
+ (merged to 'next' on 2011-10-12 at 80d9503)
64
+ + fix "git apply --index ..." not to deref NULL
65
+
66
+* jn/gitweb-manpages (2011-10-16) 5 commits
67
+ (merged to 'next' on 2011-10-16 at 6555a07)
68
+ + gitweb: Add gitweb manpages to 'gitweb' package in git.spec
69
+ + Documentation: Add gitweb config variables to git-config(1)
70
+ + Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
71
+ + gitweb: Add gitweb(1) manpage for gitweb itself
72
+ + gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
73
+
74
+* js/log-show-children (2011-10-04) 1 commit
75
+ (merged to 'next' on 2011-10-06 at de8f6f2)
76
+ + log --children
77
+
78
+* js/maint-no-cherry-pick-head-after-punted (2011-10-06) 2 commits
79
+ + cherry-pick: do not give irrelevant advice when cherry-pick punted
80
+ + revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
81
+ (this branch is used by js/no-cherry-pick-head-after-punted.)
82
+
83
+Will merge to 'maint' later.
84
+
85
+* js/merge-edit-option (2011-10-12) 1 commit
86
+ (merged to 'next' on 2011-10-12 at db28da3)
87
+ + Teach merge the '[-e|--edit]' option
88
+
89
+* js/no-cherry-pick-head-after-punted (2011-10-06) 1 commit
90
+ (merged to 'next' on 2011-10-10 at acb29ee)
91
+ + Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted
92
+ (this branch uses js/maint-no-cherry-pick-head-after-punted.)
93
94
* md/smtp-tls-hello-again (2011-10-15) 1 commit
95
(merged to 'next' on 2011-10-16 at 3e27de4)
96
+ send-email: Honour SMTP domain when using TLS
97
127
-Will merge to 'master' soonish.
128
-
98
* pt/mingw-misc-fixes (2011-10-15) 7 commits
99
(merged to 'next' on 2011-10-16 at 2dc0b55)
100
+ t9901: fix line-ending dependency on windows
@@ -136,7 +105,81 @@ Will merge to 'master' soonish.
105
+ t9001: do not fail only due to CR/LF issues
106
+ t1020: disable the pwd test on MinGW
107
139
-Will merge to 'master' soonish.
108
+* rs/diff-whole-function (2011-10-10) 2 commits
109
+ (merged to 'next' on 2011-10-11 at 6196752)
110
+ + diff: add option to show whole functions as context
111
+ + xdiff: factor out get_func_line()
112
+
113
+* rs/pickaxe (2011-10-07) 7 commits
114
+ (merged to 'next' on 2011-10-11 at 27d02b2)
115
+ + pickaxe: factor out pickaxe
116
+ + pickaxe: give diff_grep the same signature as has_changes
117
+ + pickaxe: pass diff_options to contains and has_changes
118
+ + pickaxe: factor out has_changes
119
+ + pickaxe: plug regex/kws leak
120
+ + pickaxe: plug regex leak
121
+ + pickaxe: plug diff filespec leak with empty needle
122
+
123
+--------------------------------------------------
124
+[Stalled]
125
+
126
+* hv/submodule-merge-search (2011-10-13) 4 commits
127
+ - submodule.c: make two functions static
128
+ - allow multiple calls to submodule merge search for the same path
129
+ - push: Don't push a repository with unpushed submodules
130
+ - push: teach --recurse-submodules the on-demand option
131
+
132
+What the topic aims to achieve may make sense, but the implementation
133
+looked somewhat suboptimal.
134
+
135
+The fix-up at the tip queued on fg/submodule-auto-push topic has been
136
+moved to this topic.
137
+
138
+* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
139
+ - t5800: point out that deleting branches does not work
140
+ - t5800: document inability to push new branch with old content
141
+
142
+Perhaps 281eee4 (revision: keep track of the end-user input from the
143
+command line, 2011-08-25) would help.
144
+
145
+* rr/revert-cherry-pick (2011-10-12) 7 commits
146
+ - revert: further simplify parsing of a line in insn sheet
147
+ - revert: Simplify passing command-line arguments around
148
+ - revert: Allow mixed pick and revert instructions
149
+ - revert: Make commit descriptions in insn sheet optional
150
+ - revert: Fix buffer overflow in insn sheet parser
151
+ - revert: Simplify getting commit subject
152
+ - revert: Free memory after get_message call
153
+
154
+Probably needs a little bit more polish, e.g. squashing the tip fixup into
155
+an earlier one in the series.
156
+
157
+* jc/lookup-object-hash (2011-08-11) 6 commits
158
+ - object hash: replace linear probing with 4-way cuckoo hashing
159
+ - object hash: we know the table size is a power of two
160
+ - object hash: next_size() helper for readability
161
+ - pack-objects --count-only
162
+ - object.c: remove duplicated code for object hashing
163
+ - object.c: code movement for readability
164
+
165
+I do not think there is anything fundamentally wrong with this series, but
166
+the risk of breakage far outweighs observed performance gain in one
167
+particular workload.
168
+
169
+--------------------------------------------------
170
+[Cooking]
171
+
172
+* jc/check-ref-format-fixup (2011-10-12) 2 commits
173
+ (merged to 'next' on 2011-10-15 at 8e89bc5)
174
+ + Restrict ref-like names immediately below $GIT_DIR
175
+ + refs.c: move dwim_ref()/dwim_log() from sha1_name.c
176
+
177
+An attempt to fix-up unfortunate side effect of mh/check-ref-format-3
178
+topic. "git show -s config" is never meant to refer to $GIT_DIR/config
179
+and treat it as a file that records an object name. But tightening the
180
+rule for reading side means we would need to tighten the rule for the
181
+writing side, too, which turned out to be rather nasty fallout that
182
+needs to be sorted out before the next release.
183
184
* pw/p4-update (2011-10-17) 6 commits
185
(merged to 'next' on 2011-10-17 at f69f6cc)
@@ -163,12 +206,6 @@ Will merge to 'master' in the fifth wave.
206
The tip commit might be loosening things a bit too much.
207
Will keep in 'pu' until hearing a convincing argument for the patch.
208
166
-* cb/httpd-test-fix-port (2011-10-17) 1 commit
167
- (merged to 'next' on 2011-10-17 at 84fb7e6)
168
- + use test number as port number
169
-
170
-Will merge to 'master' soonish.
171
-
209
* jc/verbose-checkout (2011-10-16) 2 commits
210
- checkout -v: give full status output after switching branches
211
- checkout: move the local changes report to the end
@@ -188,28 +225,26 @@ Fun.
225
Will keep in 'pu' until the planned re-roll comes.
226
227
* mh/ref-api-2 (2011-10-17) 14 commits
191
- - resolve_gitlink_ref_recursive(): change to work with struct ref_cache
192
- - Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
193
- - resolve_gitlink_ref(): improve docstring
194
- - get_ref_dir(): change signature
195
- - refs: change signatures of get_packed_refs() and get_loose_refs()
196
- - is_dup_ref(): extract function from sort_ref_array()
197
- - add_ref(): add docstring
198
- - parse_ref_line(): add docstring
199
- - is_refname_available(): remove the "quiet" argument
200
- - clear_ref_array(): rename from free_ref_array()
201
- - refs: rename parameters result -> sha1
202
- - refs: rename "refname" variables
203
- - struct ref_entry: document name member
204
- - cache.h: add comments for git_path() and git_path_submodule()
228
+ (merged to 'next' on 2011-10-19 at cc89f0e)
229
+ + resolve_gitlink_ref_recursive(): change to work with struct ref_cache
230
+ + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions
231
+ + resolve_gitlink_ref(): improve docstring
232
+ + get_ref_dir(): change signature
233
+ + refs: change signatures of get_packed_refs() and get_loose_refs()
234
+ + is_dup_ref(): extract function from sort_ref_array()
235
+ + add_ref(): add docstring
236
+ + parse_ref_line(): add docstring
237
+ + is_refname_available(): remove the "quiet" argument
238
+ + clear_ref_array(): rename from free_ref_array()
239
+ + refs: rename parameters result -> sha1
240
+ + refs: rename "refname" variables
241
+ + struct ref_entry: document name member
242
+ + cache.h: add comments for git_path() and git_path_submodule()
243
(this branch uses mh/ref-api.)
244
207
-Will merge to 'next'.
208
-
245
* po/insn-editor (2011-10-17) 1 commit
210
- - "rebase -i": support special-purpose editor to edit insn sheet
211
-
212
-Will merge to 'next'.
246
+ (merged to 'next' on 2011-10-19 at cbf5e0b)
247
+ + "rebase -i": support special-purpose editor to edit insn sheet
248
249
* dm/pack-objects-update (2011-10-18) 4 commits
250
- pack-objects: don't traverse objects unnecessarily
@@ -225,45 +260,10 @@ Will merge to 'next'.
260
* jc/make-tags (2011-10-18) 1 commit
261
- Makefile: ask "ls-files" to list source files if available
262
228
---------------------------------------------------
229
-[Stalled]
230
-
231
-* hv/submodule-merge-search (2011-10-13) 4 commits
232
- - submodule.c: make two functions static
233
- - allow multiple calls to submodule merge search for the same path
234
- - push: Don't push a repository with unpushed submodules
235
- - push: teach --recurse-submodules the on-demand option
236
-
237
-What the topic aims to achieve may make sense, but the implementation
238
-looked somewhat suboptimal.
239
-
240
-The fix-up at the tip queued on fg/submodule-auto-push topic has been
241
-moved to this topic.
242
-
243
-* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
244
- - t5800: point out that deleting branches does not work
245
- - t5800: document inability to push new branch with old content
246
-
247
-Perhaps 281eee4 (revision: keep track of the end-user input from the
248
-command line, 2011-08-25) would help.
249
-
250
-* rr/revert-cherry-pick (2011-10-12) 7 commits
251
- - revert: further simplify parsing of a line in insn sheet
252
- - revert: Simplify passing command-line arguments around
253
- - revert: Allow mixed pick and revert instructions
254
- - revert: Make commit descriptions in insn sheet optional
255
- - revert: Fix buffer overflow in insn sheet parser
256
- - revert: Simplify getting commit subject
257
- - revert: Free memory after get_message call
258
-
259
-Probably needs a little bit more polish, e.g. squashing the tip fixup into
260
-an earlier one in the series.
261
-
262
-* jc/signed-commit (2011-10-05) 4 commits
263
+* jc/signed-commit (2011-10-18) 3 commits
264
+ - log: --show-signature
265
- commit: teach --gpg-sign option
266
- Split GPG interface into its own helper library
265
- - rename "match_refs()" to "match_push_refs()"
266
- - send-pack: typofix error message
267
268
This is to replace the earlier "signed push" experiments. "verify-tag"
269
equivalent needs to be written before this can proceed. I suspect that
@@ -271,21 +271,6 @@ teaching "verify-tag" to notice and also handle signed commits would be
271
the easiest, but "git tag --verify $commit" might look slightly funny
272
from the UI POV. I dunno.
273
274
-* jc/lookup-object-hash (2011-08-11) 6 commits
275
- - object hash: replace linear probing with 4-way cuckoo hashing
276
- - object hash: we know the table size is a power of two
277
- - object hash: next_size() helper for readability
278
- - pack-objects --count-only
279
- - object.c: remove duplicated code for object hashing
280
- - object.c: code movement for readability
281
-
282
-I do not think there is anything fundamentally wrong with this series, but
283
-the risk of breakage far outweighs observed performance gain in one
284
-particular workload.
285
-
286
---------------------------------------------------
287
-[Cooking]
288
-
274
* mh/ref-api (2011-10-16) 7 commits
275
(merged to 'next' on 2011-10-17 at 219000f)
276
+ clear_ref_cache(): inline function
@@ -299,32 +284,6 @@ particular workload.
284
285
Will merge to 'master' in the sixth wave.
286
302
-* jn/gitweb-manpages (2011-10-16) 5 commits
303
- (merged to 'next' on 2011-10-16 at 6555a07)
304
- + gitweb: Add gitweb manpages to 'gitweb' package in git.spec
305
- + Documentation: Add gitweb config variables to git-config(1)
306
- + Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
307
- + gitweb: Add gitweb(1) manpage for gitweb itself
308
- + gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
309
-
310
-Will merge to 'master' soonish.
311
-
312
-* jm/maint-apply-detects-corrupt-patch-header (2011-10-12) 1 commit
313
- (merged to 'next' on 2011-10-12 at 80d9503)
314
- + fix "git apply --index ..." not to deref NULL
315
-
316
-Will merge to 'master' soonish.
317
-
318
-* bk/submodule-in-recursive-merge (2011-10-13) 2 commits
319
- (merged to 'next' on 2011-10-15 at e02205c)
320
- + submodule: Search for merges only at end of recursive merge
321
- + submodule: Demonstrate known breakage during recursive merge
322
-
323
-Brad helped resurrecting good bits earlier tangled in the stalled topic
324
-hv/submodule-merge-search by mistake.
325
-
326
-Will merge to 'master' soonish.
327
-
287
* sg/complete-refs (2011-10-15) 10 commits
288
- completion: remove broken dead code from __git_heads() and __git_tags()
289
- completion: fast initial completion for config 'remote.*.fetch' value
@@ -343,11 +302,11 @@ Will keep in 'pu' until an Ack or two from people who have worked on the
302
completion in the past comes.
303
304
* jc/unseekable-bundle (2011-10-13) 2 commits
346
- - bundle: add parse_bundle_header() helper function
347
- - bundle: allowing to read from an unseekable fd
305
+ (merged to 'next' on 2011-10-19 at 2978ee0)
306
+ + bundle: add parse_bundle_header() helper function
307
+ + bundle: allowing to read from an unseekable fd
308
309
I am not entirely happy with the first patch but it is not so bad either.
350
-Will merge to 'next'.
310
311
* jk/daemon-msgs (2011-10-15) 1 commit
312
(merged to 'next' on 2011-10-15 at 415cf53)
@@ -373,31 +332,6 @@ Will merge to 'master' in the fifth wave.
332
333
Will merge to 'master' in the sixth wave.
334
376
-* js/merge-edit-option (2011-10-12) 1 commit
377
- (merged to 'next' on 2011-10-12 at db28da3)
378
- + Teach merge the '[-e|--edit]' option
379
-
380
-Will merge to 'master' in the fifth wave.
381
-
382
-* rs/diff-whole-function (2011-10-10) 2 commits
383
- (merged to 'next' on 2011-10-11 at 6196752)
384
- + diff: add option to show whole functions as context
385
- + xdiff: factor out get_func_line()
386
-
387
-Will merge to 'master' in the fifth wave.
388
-
389
-* rs/pickaxe (2011-10-07) 7 commits
390
- (merged to 'next' on 2011-10-11 at 27d02b2)
391
- + pickaxe: factor out pickaxe
392
- + pickaxe: give diff_grep the same signature as has_changes
393
- + pickaxe: pass diff_options to contains and has_changes
394
- + pickaxe: factor out has_changes
395
- + pickaxe: plug regex/kws leak
396
- + pickaxe: plug regex leak
397
- + pickaxe: plug diff filespec leak with empty needle
398
-
399
-Will merge to 'master' in the fifth wave.
400
-
335
* sc/difftool-skip (2011-10-14) 2 commits
336
(merged to 'next' on 2011-10-14 at b91c581)
337
+ t7800: avoid arithmetic expansion notation
@@ -406,44 +340,12 @@ Will merge to 'master' in the fifth wave.
340
341
Will merge to 'master' in the fifth wave.
342
409
-* jc/check-ref-format-fixup (2011-10-12) 2 commits
410
- (merged to 'next' on 2011-10-15 at 8e89bc5)
411
- + Restrict ref-like names immediately below $GIT_DIR
412
- + refs.c: move dwim_ref()/dwim_log() from sha1_name.c
413
-
414
-An attempt to fix-up unfortunate side effect of mh/check-ref-format-3
415
-topic. "git show -s config" is never meant to refer to $GIT_DIR/config
416
-and treat it as a file that records an object name.
417
-
418
-Will merge to 'master' soonish so that we can have enough time to deal
419
-with possible fall-outs.
420
-
343
* jc/maint-remove-renamed-ref (2011-10-12) 1 commit
344
(merged to 'next' on 2011-10-12 at 819c3e4)
345
+ branch -m/-M: remove undocumented RENAMED-REF
346
347
Will merge to 'master' in the sixth wave.
348
427
-* js/no-cherry-pick-head-after-punted (2011-10-06) 1 commit
428
- (merged to 'next' on 2011-10-10 at acb29ee)
429
- + Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted
430
- (this branch uses js/maint-no-cherry-pick-head-after-punted.)
431
-
432
-Will merge to 'master' in the fifth wave.
433
-
434
-* js/maint-no-cherry-pick-head-after-punted (2011-10-06) 2 commits
435
- + cherry-pick: do not give irrelevant advice when cherry-pick punted
436
- + revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
437
- (this branch is used by js/no-cherry-pick-head-after-punted.)
438
-
439
-Will merge to 'maint' later.
440
-
441
-* js/log-show-children (2011-10-04) 1 commit
442
- (merged to 'next' on 2011-10-06 at de8f6f2)
443
- + log --children
444
-
445
-Will merge to 'master' in the fifth wave.
446
-
349
* ph/transport-with-gitfile (2011-10-11) 5 commits
350
(merged to 'next' on 2011-10-12 at 6d58417)
351
+ Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile