What's cooking (2013/08 #07)
Junio C Hamano committed
Aug 28, 2013 at 16:23 UTC
1ca553bdb277a48b3006b80fa8ba9f396926d185
1 file changed
+322
-310
whats-cooking.txt
+322
-310
@@ -1,23 +1,35 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2013, #06; Tue, 27)
3
+Subject: What's cooking in git.git (Aug 2013, #07; Wed, 28)
4
X-master-at: e230c568c4b9a991e3175e5f65171a566fd8e39c
5
-X-next-at: 7bc9019c3113aff1e050cc98e8c378a6e66abe81
5
+X-next-at: 4ec6b414090cf91b9ca5200ee6921ae9a92582ff
6
7
-What's cooking in git.git (Aug 2013, #06; Tue, 27)
7
+What's cooking in git.git (Aug 2013, #07; Wed, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-Git 1.8.4 was tagged and released recently, and we will shortly go
15
-into a new development cycle for the next one, likely to be 1.8.5.
14
+The tip of 'next' has been rewound. I ejected a handful of topics
15
+that have been cooking there while rebuilding it, but it is not
16
+because I found anything in them problematic, but merely because
17
+they were young and I wanted to give their authors a chance to tweak
18
+with a reroll instead of a set of follow-up patches. Unless I hear
19
+otherwise in a few days, they will be merged back to 'next'.
20
17
-I expect this cycle to conclude at around the end of October, and we
18
-will have another release by the end of the year. The first release
19
-in the coming year may be named "Git 2.0" with the promised
20
-compatibility breakages.
21
+By the way, the push that overrides the usual "must fast-forward"
22
+was done using the "force-with-lease" option that has been cooking
23
+in next, like so:
24
+
25
+ $ git fetch ko next
26
+ $ anchor=$(git rev-parse --verify FETCH_HEAD)
27
+ $ for remote in ko repo gph github2
28
+ do
29
+ git push --force-with-lease=refs/heads/next:$anchor $remote next
30
+ done
31
+
32
+I used to do this with just --force.
33
34
You can find the changes described here in the integration branches
35
of the repositories listed at
@@ -27,29 +39,172 @@ of the repositories listed at
39
--------------------------------------------------
40
[New Topics]
41
42
+* cc/replace-with-the-same-type (2013-08-27) 5 commits
43
+ - Documentation/replace: add Creating Replacement Objects section
44
+ - t6050-replace: add test to clean up all the replace refs
45
+ - t6050-replace: test that objects are of the same type
46
+ - Documentation/replace: state that objects must be of the same type
47
+ - replace: forbid replacing an object with one of a different type
48
+
49
+ Using the replace mechanism to swap an object with another object
50
+ of a different type can introduce inconsistency (e.g. a tree
51
+ expects an object name to refer to a blob, but the blob object can
52
+ be mistakenly or maliciously replaced with an object with a
53
+ different type). Attempt to forbid such.
54
+
55
+ This may need to be given an escape hatch "--force", though.
56
+
57
+
58
+* jx/clean-interactive (2013-08-28) 1 commit
59
+ - documentation: clarify notes for clean.requireForce
60
+
61
+ Finishing touches to update the document to adjust to a new option
62
+ "git clean" learned recently.
63
+
64
+ Will merge to 'next'.
65
+
66
+
67
+* mm/status-without-comment-char (2013-08-28) 3 commits
68
+ - SQUASH??? wt-status.c decl-after-stmt
69
+ - status: introduce status.displayCommentChar to disable display of #
70
+ - submodule: introduce --[no-]display-comment-char
71
+
72
+ Allow "git status" to omit the prefix to make its output a comment
73
+ in a commit log editor, which is not necessary for human
74
+ consumption.
75
+
76
+
77
+* xx/cleanup (2013-08-28) 1 commit
78
+ - builtin/stripspace.c: fix broken indentation
79
+
80
+ Will probably directly cherry-pick to 'maint' or 'master' and kill
81
+ the branch.
82
+
83
+--------------------------------------------------
84
+[Stalled]
85
+
86
+* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
87
+ - git-send-email: Cache generated message-ids, use them when prompting
88
+ - git-send-email: add optional 'choices' parameter to the ask sub
89
+
90
+
91
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
92
+ - ### DONTMERGE: needs better explanation on what config they need
93
+ - pack-refs.c: Add missing call to git_config()
94
+ - show-ref.c: Add missing call to git_config()
95
+
96
+ The changes themselves are probably good, but it is unclear what
97
+ basic setting needs to be read for which exact operation.
98
+
99
+ Waiting for clarification.
100
+ $gmane/228294
101
+
102
+
103
+* jh/shorten-refname (2013-05-07) 4 commits
104
+ - t1514: refname shortening is done after dereferencing symbolic refs
105
+ - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
106
+ - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
107
+ - t1514: Add tests of shortening refnames in strict/loose mode
108
+
109
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
110
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
111
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
112
+ ref that points at remotes/origin/something, then it should show
113
+ "origin/something" and it already does).
114
+
115
+ Expecting a reroll, as an early part of a larger series.
116
+ $gmane/225137
117
+
118
+
119
+* jk/list-objects-sans-blobs (2013-06-06) 4 commits
120
+ . archive: ignore blob objects when checking reachability
121
+ . list-objects: optimize "revs->blob_objects = 0" case
122
+ . upload-archive: restrict remote objects with reachability check
123
+ . clear parsed flag when we free tree buffers
124
+
125
+ Attempt to allow "archive --remote=$there $arbitrary_sha1" while
126
+ keeping the reachability safety.
127
+
128
+ Seems to break some tests in a trivial and obvious way.
129
+
130
+
131
+* mg/more-textconv (2013-05-10) 7 commits
132
+ - grep: honor --textconv for the case rev:path
133
+ - grep: allow to use textconv filters
134
+ - t7008: demonstrate behavior of grep with textconv
135
+ - cat-file: do not die on --textconv without textconv filters
136
+ - show: honor --textconv for blobs
137
+ - diff_opt: track whether flags have been set explicitly
138
+ - t4030: demonstrate behavior of show with textconv
139
+
140
+ Make "git grep" and "git show" pay attention to --textconv when
141
+ dealing with blob objects.
142
+
143
+ I thought this was pretty well designed and executed, but it seems
144
+ there are some doubts on the list; kicked back to 'pu'.
145
+
146
+
147
+* jc/format-patch (2013-04-22) 2 commits
148
+ - format-patch: --inline-single
149
+ - format-patch: rename "no_inline" field
150
+
151
+ A new option to send a single patch to the standard output to be
152
+ appended at the bottom of a message. I personally have no need for
153
+ this, but it was easy enough to cobble together. Tests, docs and
154
+ stripping out more MIMEy stuff are left as exercises to interested
155
+ parties.
156
+
157
+ Not ready for inclusion.
158
+
159
+ Will discard unless we hear from anybody who is interested in
160
+ tying its loose ends.
161
+
162
+
163
+* jk/gitweb-utf8 (2013-04-08) 4 commits
164
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
165
+ - gitweb: Don't append ';js=(0|1)' to external links
166
+ - gitweb: Make feed title valid utf8
167
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
168
+
169
+ Various fixes to gitweb.
170
+
171
+ Drew Northup volunteered to take a look into this.
172
+ $gmane/226216
173
+
174
+
175
+* jc/show-branch (2013-06-07) 5 commits
176
+ - show-branch: use commit slab to represent bitflags of arbitrary width
177
+ - show-branch.c: remove "all_mask"
178
+ - show-branch.c: abstract out "flags" operation
179
+ - show-branch.c: lift all_mask/all_revs to a global static
180
+ - show-branch.c: update comment style
181
+
182
+ Waiting for the final step to lift the hard-limit before sending it out.
183
+
184
+--------------------------------------------------
185
+[Cooking]
186
+
187
* js/xread-in-full (2013-08-20) 1 commit
31
- (merged to 'next' on 2013-08-20 at 95baa13)
32
- + stream_to_pack: xread does not guarantee to read all requested bytes
188
+ - stream_to_pack: xread does not guarantee to read all requested bytes
189
190
Originally merged to 'next' on 2013-08-20
191
192
A call to xread() was used without a loop around to cope with short
193
read in the codepath to stream new contents to a pack.
194
39
- Will cook in 'next'.
195
+ Will merge to 'next'.
196
197
198
* sb/mailmap-freeing-NULL-is-ok (2013-08-20) 1 commit
43
- (merged to 'next' on 2013-08-20 at 303b16c)
44
- + mailmap: remove redundant check for freeing memory
199
+ - mailmap: remove redundant check for freeing memory
200
201
Originally merged to 'next' on 2013-08-20
202
48
- Will cook in 'next'.
203
+ Will merge to 'next'.
204
205
206
* tg/index-struct-sizes (2013-08-20) 1 commit
52
- (merged to 'next' on 2013-08-22 at df6b8e2)
207
+ (merged to 'next' on 2013-08-28 at c815042)
208
+ read-cache: use fixed width integer types
209
210
Originally merged to 'next' on 2013-08-22
@@ -57,11 +212,11 @@ of the repositories listed at
212
The code that reads from a region that mmaps an on-disk index
213
assumed that "int"/"short" are always 32/16 bits.
214
60
- Will cook in 'next'.
215
+ Will merge to 'master' in the second batch.
216
217
218
* bc/completion-for-bash-3.0 (2013-08-22) 3 commits
64
- (merged to 'next' on 2013-08-22 at 46c5bb2)
219
+ (merged to 'next' on 2013-08-28 at fb87a84)
220
+ contrib/git-prompt.sh: handle missing 'printf -v' more gracefully
221
+ t9902-completion.sh: old Bash still does not support array+=('') notation
222
+ git-completion.bash: use correct Bash/Zsh array length syntax
@@ -72,23 +227,21 @@ of the repositories listed at
227
grok some constructs like 'printf -v varname' the prompt and
228
completion code started to use recently.
229
75
- Will cook in 'next'.
230
+ Will merge to 'master'.
231
232
233
* bc/submodule-status-ignored (2013-08-20) 2 commits
79
- (merged to 'next' on 2013-08-22 at 3dfd2a3)
80
- + submodule: don't print status output with ignore=all
81
- + submodule: fix confusing variable name
234
+ - submodule: don't print status output with ignore=all
235
+ - submodule: fix confusing variable name
236
237
Originally merged to 'next' on 2013-08-22
238
85
- Will cook in 'next'.
239
+ Will merge to 'next'.
240
241
242
* jk/config-int-range-check (2013-08-21) 2 commits
89
- (merged to 'next' on 2013-08-22 at 465efb3)
90
- + teach git-config to output large integers
91
- + config: properly range-check integer values
243
+ - teach git-config to output large integers
244
+ - config: properly range-check integer values
245
246
Originally merged to 'next' on 2013-08-22
247
@@ -96,8 +249,6 @@ of the repositories listed at
249
number does not fit in "int" (on 32-bit platforms anyway) but it
250
did not.
251
99
- Will cook in 'next'.
100
-
252
253
* jk/duplicate-objects-in-packs (2013-08-24) 6 commits
254
- default pack.indexDuplicates to false
@@ -121,24 +272,18 @@ of the repositories listed at
272
273
274
* rt/rebase-p-no-merge-summary (2013-08-21) 1 commit
124
- (merged to 'next' on 2013-08-22 at 5310599)
125
- + rebase --preserve-merges: ignore "merge.log" config
275
+ - rebase --preserve-merges: ignore "merge.log" config
276
277
Originally merged to 'next' on 2013-08-22
278
279
"git rebase -p" internally used the merge machinery, but when
280
rebasing, there should not be a need for merge summary.
281
132
- Will cook in 'next'.
133
-
134
-
135
-* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
136
- - git-send-email: Cache generated message-ids, use them when prompting
137
- - git-send-email: add optional 'choices' parameter to the ask sub
282
+ Will merge to 'next'.
283
284
285
* sp/clip-read-write-to-8mb (2013-08-20) 2 commits
141
- (merged to 'next' on 2013-08-22 at 254e75d)
286
+ (merged to 'next' on 2013-08-28 at c9840d7)
287
+ Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"
288
+ xread, xwrite: limit size of IO to 8MB
289
@@ -149,19 +294,20 @@ of the repositories listed at
294
operation needs to be killed and incidentally works around broken
295
64-bit systems that cannot take a 2GB write or read in one go.
296
152
- Will cook in 'next'.
297
+ Will merge to 'master' in the second batch.
298
299
300
* sp/doc-smart-http (2013-08-21) 1 commit
156
- (merged to 'next' on 2013-08-22 at 4a16937)
301
+ (merged to 'next' on 2013-08-28 at 20a6877)
302
+ Document the HTTP transport protocols
303
304
Originally merged to 'next' on 2013-08-22
305
161
- Will cook in 'next'.
306
+ Will merge to 'master'.
307
308
164
-* dw/diff-no-index-doc (2013-08-22) 1 commit
309
+* dw/diff-no-index-doc (2013-08-28) 2 commits
310
+ - diff --no-index: describe in a separate paragraph
311
- diff --no-index: clarify operation when not inside a repository
312
313
When the user types "git diff" outside a working tree, thinking he
@@ -190,21 +336,18 @@ of the repositories listed at
336
337
338
* hv/config-from-blob (2013-08-26) 1 commit
193
- (merged to 'next' on 2013-08-27 at 7bc9019)
339
+ (merged to 'next' on 2013-08-28 at 189c6c1)
340
+ config: do not use C function names as struct members
341
196
- Originally merged to 'next' on 2013-08-27
197
-
342
Portability fix.
343
344
Will merge to 'master', aiming to later apply to 1.8.4.x maintenance track.
345
346
203
-* jk/mailmap-incomplete-line (2013-08-25) 2 commits
204
- - mailmap: avoid allocation when reading from blob
347
+* jk/mailmap-incomplete-line (2013-08-28) 1 commit
348
- mailmap: handle mailmap blobs without trailing newlines
349
207
- Will merge to 'next'.
350
+ Will merge to 'next' and later to 'master' and 'maint'.
351
352
353
* jk/write-broken-index-with-nul-sha1 (2013-08-26) 1 commit
@@ -219,7 +362,9 @@ of the repositories listed at
362
- add -i test: use skip_all instead of repeated PERL prerequisite
363
- Make test "using invalid commit with -C" more strict
364
222
- Am I waiting for another reroll?
365
+ Some tests were not skipped under NO_PERL build.
366
+
367
+ Will merge to 'next'.
368
369
370
* mm/fast-import-feature-doc (2013-08-25) 1 commit
@@ -241,7 +386,7 @@ of the repositories listed at
386
387
388
* nd/fetch-pack-shallow-fix (2013-08-25) 1 commit
244
- (merged to 'next' on 2013-08-27 at 7c2a162)
389
+ (merged to 'next' on 2013-08-28 at 6f5ed42)
390
+ fetch-pack: do not remove .git/shallow file when --depth is not specified
391
392
Originally merged to 'next' on 2013-08-27
@@ -252,145 +397,47 @@ of the repositories listed at
397
Will merge to 'master', aiming to later apply to 1.8.4.x maintenance track.
398
399
255
-* ta/user-manual (2013-08-24) 6 commits
400
+* ta/user-manual (2013-08-27) 11 commits
401
+ - "git prune" is safe
402
- Remove irrelevant reference from "Tying it all together"
403
- Remove unnecessary historical note from "Object storage format"
404
+ - Improve section "Merging multiple trees"
405
+ - Improve section "Manipulating branches"
406
- Simplify "How to make a commit"
407
+ - Fix some typos and improve wording
408
- Use "git merge" instead of "git pull ."
409
- Use current output for "git repack"
410
+ - Use current "detached HEAD" message
411
- Call it "Git User Manual" and remove reference to very old Git version
412
413
Update the user's manual to more recent versions of Git.
414
265
- I've picked up only the least questionable bits from a slightly
266
- larger series.
267
-
415
416
* tb/precompose-autodetect-fix (2013-08-27) 1 commit
417
- Set core.precomposeunicode to true on e.g. HFS+
418
419
Will merge to 'next'.
420
274
---------------------------------------------------
275
-[Stalled]
276
-
277
-* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
278
- - ### DONTMERGE: needs better explanation on what config they need
279
- - pack-refs.c: Add missing call to git_config()
280
- - show-ref.c: Add missing call to git_config()
281
-
282
- The changes themselves are probably good, but it is unclear what
283
- basic setting needs to be read for which exact operation.
284
-
285
- Waiting for clarification.
286
- $gmane/228294
287
-
288
-
289
-* jh/shorten-refname (2013-05-07) 4 commits
290
- - t1514: refname shortening is done after dereferencing symbolic refs
291
- - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
292
- - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
293
- - t1514: Add tests of shortening refnames in strict/loose mode
294
-
295
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
296
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
297
- "origin/HEAD", which is fixed with this series (if it is a symbolic
298
- ref that points at remotes/origin/something, then it should show
299
- "origin/something" and it already does).
300
-
301
- Expecting a reroll, as an early part of a larger series.
302
- $gmane/225137
303
-
304
-
305
-* jk/list-objects-sans-blobs (2013-06-06) 4 commits
306
- . archive: ignore blob objects when checking reachability
307
- . list-objects: optimize "revs->blob_objects = 0" case
308
- . upload-archive: restrict remote objects with reachability check
309
- . clear parsed flag when we free tree buffers
310
-
311
- Attempt to allow "archive --remote=$there $arbitrary_sha1" while
312
- keeping the reachability safety.
313
-
314
- Seems to break some tests in a trivial and obvious way.
315
-
316
-
317
-* mg/more-textconv (2013-05-10) 7 commits
318
- - grep: honor --textconv for the case rev:path
319
- - grep: allow to use textconv filters
320
- - t7008: demonstrate behavior of grep with textconv
321
- - cat-file: do not die on --textconv without textconv filters
322
- - show: honor --textconv for blobs
323
- - diff_opt: track whether flags have been set explicitly
324
- - t4030: demonstrate behavior of show with textconv
325
-
326
- Make "git grep" and "git show" pay attention to --textconv when
327
- dealing with blob objects.
328
-
329
- I thought this was pretty well designed and executed, but it seems
330
- there are some doubts on the list; kicked back to 'pu'.
331
-
332
-
333
-* jc/format-patch (2013-04-22) 2 commits
334
- - format-patch: --inline-single
335
- - format-patch: rename "no_inline" field
336
-
337
- A new option to send a single patch to the standard output to be
338
- appended at the bottom of a message. I personally have no need for
339
- this, but it was easy enough to cobble together. Tests, docs and
340
- stripping out more MIMEy stuff are left as exercises to interested
341
- parties.
342
-
343
- Not ready for inclusion.
344
-
345
- Will discard unless we hear from anybody who is interested in
346
- tying its loose ends.
347
-
348
-
349
-* jk/gitweb-utf8 (2013-04-08) 4 commits
350
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
351
- - gitweb: Don't append ';js=(0|1)' to external links
352
- - gitweb: Make feed title valid utf8
353
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
354
-
355
- Various fixes to gitweb.
356
-
357
- Drew Northup volunteered to take a look into this.
358
- $gmane/226216
359
-
360
-
361
-* jc/show-branch (2013-06-07) 5 commits
362
- - show-branch: use commit slab to represent bitflags of arbitrary width
363
- - show-branch.c: remove "all_mask"
364
- - show-branch.c: abstract out "flags" operation
365
- - show-branch.c: lift all_mask/all_revs to a global static
366
- - show-branch.c: update comment style
367
-
368
- Waiting for the final step to lift the hard-limit before sending it out.
369
-
370
---------------------------------------------------
371
-[Cooking]
421
422
* tf/gitweb-ss-tweak (2013-08-20) 4 commits
374
- (merged to 'next' on 2013-08-22 at 3978368)
375
- + gitweb: make search help link less ugly
376
- + gitweb: omit the repository owner when it is unset
377
- + gitweb: vertically centre contents of page footer
378
- + gitweb: ensure OPML text fits inside its box
423
+ - gitweb: make search help link less ugly
424
+ - gitweb: omit the repository owner when it is unset
425
+ - gitweb: vertically centre contents of page footer
426
+ - gitweb: ensure OPML text fits inside its box
427
428
Originally merged to 'next' on 2013-08-22
429
430
Tweak Gitweb CSS to layout some elements better.
431
384
- Will cook in 'next'.
432
+ Will merge to 'next'.
433
434
435
* es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit
388
- (merged to 'next' on 2013-08-20 at 9f3d0c8)
389
- + rebase -i: fix cases ignoring core.commentchar
436
+ - rebase -i: fix cases ignoring core.commentchar
437
438
Originally merged to 'next' on 2013-08-20
439
393
- Will cook in 'next'.
440
+ Will merge to 'next'.
441
442
443
* jx/branch-vv-always-compare-with-upstream (2013-08-26) 2 commits
@@ -405,7 +452,8 @@ of the repositories listed at
452
Am I waiting for another reroll?
453
454
408
-* nd/fetch-into-shallow (2013-08-18) 6 commits
455
+* nd/fetch-into-shallow (2013-08-28) 7 commits
456
+ - Add testcase for needless objects during a shallow fetch
457
- list-objects: mark more commits as edges in mark_edges_uninteresting
458
- list-objects: reduce one argument in mark_edges_uninteresting
459
- upload-pack: delegate rev walking in shallow fetch to pack-objects
@@ -421,39 +469,37 @@ of the repositories listed at
469
470
471
* sb/diff-delta-remove-needless-comparison (2013-08-18) 1 commit
424
- (merged to 'next' on 2013-08-20 at c35730b)
472
+ (merged to 'next' on 2013-08-28 at ba09c3f)
473
+ create_delta_index: simplify condition always evaluating to true
474
475
Originally merged to 'next' on 2013-08-20
476
429
- Will cook in 'next'.
477
+ Will merge to 'master'.
478
479
480
* sg/bash-prompt-lf-in-cwd-test (2013-08-18) 1 commit
433
- (merged to 'next' on 2013-08-20 at 5544f62)
481
+ (merged to 'next' on 2013-08-28 at eb449b5)
482
+ bash prompt: test the prompt with newline in repository path
483
484
Originally merged to 'next' on 2013-08-20
485
438
- Will cook in 'next'.
486
+ Will merge to 'master'.
487
488
489
* jl/some-submodule-config-are-not-boolean (2013-08-19) 1 commit
442
- (merged to 'next' on 2013-08-20 at 140c2e4)
490
+ (merged to 'next' on 2013-08-28 at 7fabc3e)
491
+ avoid segfault on submodule.*.path set to an empty "true"
492
493
Originally merged to 'next' on 2013-08-20
494
447
- Will cook in 'next'.
495
+ Will merge to 'master'.
496
497
498
* jc/ls-files-killed-optim (2013-08-23) 4 commits
451
- (merged to 'next' on 2013-08-27 at f7687d1)
452
- + dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
453
- (merged to 'next' on 2013-08-20 at d4bf1ad)
454
- + t3010: update to demonstrate "ls-files -k" optimization pitfalls
455
- + ls-files -k: a directory only can be killed if the index has a non-directory
456
- + dir.c: use the cache_* macro to access the current index
499
+ - dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
500
+ - t3010: update to demonstrate "ls-files -k" optimization pitfalls
501
+ - ls-files -k: a directory only can be killed if the index has a non-directory
502
+ - dir.c: use the cache_* macro to access the current index
503
504
Originally merged to 'next' on 2013-08-27
505
@@ -462,11 +508,11 @@ of the repositories listed at
508
shared code with the logic to find all the untracked files, which
509
made it unnecessarily inefficient.
510
465
- Will cook in 'next'.
511
+ Will merge to 'next'.
512
513
514
* es/blame-L-twice (2013-08-06) 16 commits
469
- (merged to 'next' on 2013-08-08 at 9d6f821)
515
+ (merged to 'next' on 2013-08-28 at e83ae2e)
516
+ line-range: reject -L line numbers less than 1
517
+ t8001/t8002: blame: add tests of -L line numbers less than 1
518
+ line-range: teach -L^:RE to search from start of file
@@ -489,11 +535,11 @@ of the repositories listed at
535
536
Teaches "git blame" to take more than one -L ranges.
537
492
- Will cook in 'next'.
538
+ Will merge to 'master' in the second batch.
539
540
541
* mm/no-shell-escape-in-die-message (2013-08-07) 1 commit
496
- (merged to 'next' on 2013-08-08 at bddff86)
542
+ (merged to 'next' on 2013-08-28 at 86b300f)
543
+ die_with_status: use "printf '%s\n'", not "echo"
544
545
Originally merged to 'next' on 2013-08-08
@@ -502,52 +548,51 @@ of the repositories listed at
548
root cause is pretty generic) where the code feeds a random, data
549
dependeant string to 'echo' and expects it to come out literally.
550
505
- Will cook in 'next'.
551
+ Will merge to 'master'.
552
553
554
* tr/fd-gotcha-fixes (2013-08-06) 1 commit
509
- (merged to 'next' on 2013-08-08 at f452c5b)
555
+ (merged to 'next' on 2013-08-28 at 5305271)
556
+ t0070: test that git_mkstemps correctly checks return value of open()
557
558
Originally merged to 'next' on 2013-08-08
559
560
Finishing touches to an earlier fix already in 'master'.
561
516
- Will cook in 'next'.
562
+ Will merge to 'master'.
563
564
565
* ap/remote-hg-tilde-is-home-directory (2013-08-09) 1 commit
520
- (merged to 'next' on 2013-08-14 at cd963e3)
566
+ (merged to 'next' on 2013-08-28 at 9bfc430)
567
+ remote-hg: fix path when cloning with tilde expansion
568
569
Originally merged to 'next' on 2013-08-14
570
525
- Will cook in 'next'.
571
+ Will merge to 'master'.
572
573
574
* es/rebase-i-no-abbrev (2013-08-25) 3 commits
529
- (merged to 'next' on 2013-08-26 at 1c3d45d)
530
- + rebase -i: fix short SHA-1 collision
531
- + t3404: rebase -i: demonstrate short SHA-1 collision
532
- + t3404: make tests more self-contained
575
+ - rebase -i: fix short SHA-1 collision
576
+ - t3404: rebase -i: demonstrate short SHA-1 collision
577
+ - t3404: make tests more self-contained
578
579
Originally merged to 'next' on 2013-08-26
580
536
- Will cook in 'next'.
581
+ Will merge to 'next'.
582
583
584
* fc/remote-hg-shared-setup (2013-08-11) 2 commits
540
- (merged to 'next' on 2013-08-14 at aae6858)
585
+ (merged to 'next' on 2013-08-28 at 41ee3fe)
586
+ remote-hg: add shared repo upgrade
587
+ remote-hg: ensure shared repo is initialized
588
589
Originally merged to 'next' on 2013-08-14
590
546
- Will cook in 'next'.
591
+ Will merge to 'master'.
592
593
594
* jc/transport-do-not-use-connect-twice-in-fetch (2013-08-07) 5 commits
550
- (merged to 'next' on 2013-08-20 at 5414722)
595
+ (merged to 'next' on 2013-08-28 at 2ed86df)
596
+ fetch: work around "transport-take-over" hack
597
+ fetch: refactor code that fetches leftover tags
598
+ fetch: refactor code that prepares a transport
@@ -563,7 +608,7 @@ of the repositories listed at
608
interface is not designed to be used more than once, hence this
609
does not work over smart-http transfer.
610
566
- Will cook in 'next'.
611
+ Will merge to 'master' in the second batch.
612
613
614
* ks/p4-view-spec (2013-08-11) 3 commits
@@ -575,55 +620,55 @@ of the repositories listed at
620
621
622
* mm/war-on-whatchanged (2013-08-13) 2 commits
578
- (merged to 'next' on 2013-08-14 at fe77c11)
623
+ (merged to 'next' on 2013-08-28 at 25e9c18)
624
+ whatchanged: document its historical nature
625
+ core-tutorial: trim the section on Inspecting Changes
626
627
Originally merged to 'next' on 2013-08-14
628
584
- Will cook in 'next'.
629
+ Will merge to 'master'.
630
631
632
* nd/gc-lock-against-each-other (2013-08-09) 1 commit
588
- (merged to 'next' on 2013-08-14 at 6999651)
633
+ (merged to 'next' on 2013-08-28 at 46e072b)
634
+ gc: reject if another gc is running, unless --force is given
635
636
Originally merged to 'next' on 2013-08-14
637
593
- Will cook in 'next'.
638
+ Will merge to 'master'.
639
640
641
* rt/doc-merge-file-diff3 (2013-08-09) 1 commit
597
- (merged to 'next' on 2013-08-14 at 1e5847b)
642
+ (merged to 'next' on 2013-08-28 at d6b8006)
643
+ Documentation/git-merge-file: document option "--diff3"
644
645
Originally merged to 'next' on 2013-08-14
646
602
- Will cook in 'next'.
647
+ Will merge to 'master'.
648
649
650
* sb/misc-cleanup (2013-08-09) 3 commits
606
- (merged to 'next' on 2013-08-14 at 9e7ff9a)
651
+ (merged to 'next' on 2013-08-28 at bc2045b)
652
+ rm: remove unneeded null pointer check
653
+ diff: fix a possible null pointer dereference
654
+ diff: remove ternary operator evaluating always to true
655
656
Originally merged to 'next' on 2013-08-14
657
613
- Will cook in 'next'.
658
+ Will merge to 'master'.
659
660
661
* aj/p4-symlink-lose-nl (2013-08-12) 1 commit
617
- (merged to 'next' on 2013-08-14 at a4959b7)
662
+ (merged to 'next' on 2013-08-28 at 5ce9ceb)
663
+ git-p4: Fix occasional truncation of symlink contents.
664
665
Originally merged to 'next' on 2013-08-14
666
622
- Will cook in 'next'.
667
+ Will merge to 'master'.
668
669
670
* es/contacts-blame-L-multi (2013-08-13) 3 commits
626
- (merged to 'next' on 2013-08-14 at 551ed3d)
671
+ (merged to 'next' on 2013-08-28 at 24ff8b4)
672
+ contacts: reduce git-blame invocations
673
+ contacts: gather all blame sources prior to invoking git-blame
674
+ contacts: validate hunk length earlier
@@ -631,38 +676,36 @@ of the repositories listed at
676
677
Originally merged to 'next' on 2013-08-14
678
634
- Will cook in 'next'.
679
+ Will merge to 'master' in the second batch.
680
681
682
* fc/unpack-trees-leakfix (2013-08-13) 1 commit
638
- (merged to 'next' on 2013-08-14 at 989f329)
683
+ (merged to 'next' on 2013-08-28 at 3ad1f21)
684
+ unpack-trees: plug a memory leak
685
686
Originally merged to 'next' on 2013-08-14
687
643
- Will cook in 'next'.
688
+ Will merge to 'master'.
689
690
691
* nd/push-no-thin (2013-08-13) 1 commit
647
- (merged to 'next' on 2013-08-14 at b2d0fa9)
648
- + push: respect --no-thin
692
+ - push: respect --no-thin
693
694
Originally merged to 'next' on 2013-08-14
695
652
- Will cook in 'next'.
696
+ Will merge to 'next'.
697
698
699
* sh/pull-rebase-preserve (2013-08-13) 1 commit
656
- (merged to 'next' on 2013-08-14 at 99a85dd)
657
- + pull: Allow pull to preserve merges when rebasing.
700
+ - pull: Allow pull to preserve merges when rebasing.
701
702
Originally merged to 'next' on 2013-08-14
703
661
- Will cook in 'next'.
704
+ Will merge to 'next'.
705
706
707
* es/blame-L-more (2013-08-05) 11 commits
665
- (merged to 'next' on 2013-08-06 at 2679f3e)
708
+ (merged to 'next' on 2013-08-28 at b73cdc9)
709
+ blame: reject empty ranges -L,+0 and -L,-0
710
+ t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0
711
+ blame: reject empty ranges -LX,+0 and -LX,-0
@@ -680,25 +723,24 @@ of the repositories listed at
723
724
More fixes to the code to parse the "-L" option in "log" and "blame".
725
683
- Will cook in 'next'.
726
+ Will merge to 'master' in the second batch.
727
728
729
* jk/cat-file-batch-optim (2013-08-05) 1 commit
687
- (merged to 'next' on 2013-08-06 at cd48621)
730
+ (merged to 'next' on 2013-08-28 at 624e60d)
731
+ cat-file: only split on whitespace when %(rest) is used
732
733
Originally merged to 'next' on 2013-08-06
734
735
Rework the reverted change to `cat-file --batch-check`.
736
694
- Will cook in 'next'.
737
+ Will merge to 'master' in the second batch.
738
739
740
* jn/post-receive-utf8 (2013-08-05) 3 commits
698
- (merged to 'next' on 2013-08-20 at 1623e8f)
699
- + hooks/post-receive-email: set declared encoding to utf-8
700
- + hooks/post-receive-email: force log messages in UTF-8
701
- + hooks/post-receive-email: use plumbing instead of git log/show
741
+ - hooks/post-receive-email: set declared encoding to utf-8
742
+ - hooks/post-receive-email: force log messages in UTF-8
743
+ - hooks/post-receive-email: use plumbing instead of git log/show
744
745
Originally merged to 'next' on 2013-08-20
746
@@ -713,11 +755,11 @@ of the repositories listed at
755
log message could be transferred with core.quotepath set and patch
756
generated as all binary, but that would be pretty much useless.
757
716
- Will cook in 'next'.
758
+ Will merge to 'next'.
759
760
761
* sb/parseopt-boolean-removal (2013-08-07) 9 commits
720
- (merged to 'next' on 2013-08-08 at b138a2d)
762
+ (merged to 'next' on 2013-08-28 at 2f3f21f)
763
+ revert: use the OPT_CMDMODE for parsing, reducing code
764
+ checkout-index: fix negations of even numbers of -n
765
+ config parsing options: allow one flag multiple times
@@ -729,17 +771,15 @@ of the repositories listed at
771
+ Remove deprecated OPTION_BOOLEAN for parsing arguments
772
(this branch uses jc/parseopt-command-modes.)
773
732
- Originally merged to 'next' on 2013-08-08
733
-
774
Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
775
OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
776
remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary.
777
738
- Will cook in 'next'.
778
+ Will merge to 'master'.
779
780
781
* mb/docs-favor-en-us (2013-08-01) 1 commit
742
- (merged to 'next' on 2013-08-06 at 763d868)
782
+ (merged to 'next' on 2013-08-28 at 82910e5)
783
+ Provide some linguistic guidance for the documentation.
784
785
Originally merged to 'next' on 2013-08-06
@@ -748,28 +788,26 @@ of the repositories listed at
788
project is en_US, but strongly discourage patches only to "fix"
789
existing en_UK strings to avoid unnecessary churns.
790
751
- Will cook in 'next'.
791
+ Will merge to 'master'.
792
793
794
* jc/parseopt-command-modes (2013-07-30) 2 commits
755
- (merged to 'next' on 2013-08-08 at 43abba9)
795
+ (merged to 'next' on 2013-08-28 at 738b399)
796
+ tag: use OPT_CMDMODE
797
+ parse-options: add OPT_CMDMODE()
798
(this branch is used by sb/parseopt-boolean-removal.)
799
760
- Originally merged to 'next' on 2013-08-08
761
-
800
Many commands use --dashed-option as a operation mode selector
801
(e.g. "git tag --delete") that the user can use at most one
802
(e.g. "git tag --delete --verify" is a nonsense) and you cannot
803
negate (e.g. "git tag --no-delete" is a nonsense). Make it easier
804
for users of parse_options() to enforce these restrictions.
805
768
- Will cook in 'next'.
806
+ Will merge to 'master'.
807
808
809
* tr/log-full-diff-keep-true-parents (2013-08-05) 2 commits
772
- (merged to 'next' on 2013-08-08 at 2fb633f)
810
+ (merged to 'next' on 2013-08-28 at e86ec11)
811
+ log: use true parents for diff when walking reflogs
812
+ log: use true parents for diff even when rewriting
813
@@ -782,11 +820,11 @@ of the repositories listed at
820
821
Tweak "git reflog -p" for the same reason using the same mechanism.
822
785
- Will cook in 'next'.
823
+ Will merge to 'master' in the second batch.
824
825
826
* bc/unuse-packfile (2013-08-02) 2 commits
789
- (merged to 'next' on 2013-08-06 at 01aa4fd)
827
+ (merged to 'next' on 2013-08-28 at 9029801)
828
+ Don't close pack fd when free'ing pack windows
829
+ sha1_file: introduce close_one_pack() to close packs on fd pressure
830
@@ -795,23 +833,22 @@ of the repositories listed at
833
Handle memory pressure and file descriptor pressure separately when
834
deciding to release pack windows to honor resource limits.
835
798
- Will cook in 'next'.
836
+ Will merge to 'master'.
837
838
839
* da/darwin (2013-08-05) 3 commits
802
- (merged to 'next' on 2013-08-05 at 5c54cfa)
840
+ (merged to 'next' on 2013-08-28 at 6e4c5ae)
841
+ OS X: Fix redeclaration of die warning
842
+ Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
805
- (merged to 'next' on 2013-08-01 at d151a94)
843
+ imap-send: use Apple's Security framework for base64 encoding
844
845
Originally merged to 'next' on 2013-08-05
846
810
- Will cook in 'next'.
847
+ Will merge to 'master'.
848
849
850
* nd/sq-quote-buf (2013-07-30) 3 commits
814
- (merged to 'next' on 2013-08-01 at dc7934a)
851
+ (merged to 'next' on 2013-08-28 at d0ffd55)
852
+ quote: remove sq_quote_print()
853
+ tar-tree: remove dependency on sq_quote_print()
854
+ for-each-ref, quote: convert *_quote_print -> *_quote_buf
@@ -820,13 +857,12 @@ of the repositories listed at
857
858
Code simplification as a preparatory step to something larger.
859
823
- Will cook in 'next'.
860
+ Will merge to 'master'.
861
862
863
* jc/url-match (2013-08-09) 7 commits
827
- (merged to 'next' on 2013-08-12 at 381d358)
864
+ (merged to 'next' on 2013-08-28 at 2a9fd23)
865
+ builtin/config.c: compilation fix
829
- (merged to 'next' on 2013-08-08 at c1ee470)
866
+ config: "git config --get-urlmatch" parses section.<url>.key
867
+ builtin/config: refactor collect_config()
868
+ config: parse http.<url>.<variable> using urlmatch
@@ -842,11 +878,11 @@ of the repositories listed at
878
879
This is a reroll of Kyle J. McKay's work.
880
845
- Will cook in 'next'.
881
+ Will merge to 'master' in the second batch.
882
883
884
* jl/submodule-mv (2013-08-06) 5 commits
849
- (merged to 'next' on 2013-08-08 at 1a57bdf)
885
+ (merged to 'next' on 2013-08-28 at 4ec6b41)
886
+ rm: delete .gitmodules entry of submodules removed from the work tree
887
+ mv: update the path entry in .gitmodules for moved submodules
888
+ submodule.c: add .gitmodules staging helper functions
@@ -860,62 +896,49 @@ of the repositories listed at
896
inclusing relocating its working tree and adjusting the paths in
897
the .gitmodules file.
898
863
- Will cook in 'next'.
899
+ Will merge to 'master' in the second batch.
900
901
902
* nd/clone-connectivity-shortcut (2013-07-23) 1 commit
867
- (merged to 'next' on 2013-07-30 at 8d16721)
903
+ (merged to 'next' on 2013-08-28 at d227f9f)
904
+ smart http: use the same connectivity check on cloning
905
906
Originally merged to 'next' on 2013-07-30
907
872
- Will cook in 'next'.
908
+ Will merge to 'master' in the second batch.
909
910
911
* db/http-savecookies (2013-08-05) 2 commits
876
- (merged to 'next' on 2013-08-05 at be6f3a3)
912
+ (merged to 'next' on 2013-08-28 at 22a8464)
913
+ t5551: Remove header from curl cookie file
878
- (merged to 'next' on 2013-07-30 at d2ad6e5)
914
+ http: add http.savecookies option to write out HTTP cookies
915
916
Originally merged to 'next' on 2013-08-05
917
883
- Will cook in 'next'.
884
-
885
-
886
-* sb/fsck-opt-bool (2013-07-29) 1 commit
887
- (merged to 'next' on 2013-07-30 at 8a9964c)
888
- + fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL
889
-
890
- Originally merged to 'next' on 2013-07-30
891
-
892
- Will drop.
893
-
894
- sb/parseopt-boolean-removal contains the moral equivalent of this
895
- change.
918
+ Will merge to 'master' in the second batch.
919
920
921
* rr/feed-real-path-to-editor (2013-07-29) 1 commit
899
- (merged to 'next' on 2013-07-30 at 72c9bcb)
922
+ (merged to 'next' on 2013-08-28 at 7458fa4)
923
+ editor: use canonicalized absolute path
924
925
Originally merged to 'next' on 2013-07-30
926
904
- Will cook in 'next'.
927
+ Will merge to 'master'.
928
929
930
* rj/doc-rev-parse (2013-07-22) 2 commits
908
- (merged to 'next' on 2013-07-22 at 8188667)
931
+ (merged to 'next' on 2013-08-28 at 0fce928)
932
+ rev-parse(1): logically group options
933
+ rev-parse: remove restrictions on some options
934
935
Originally merged to 'next' on 2013-07-22
936
914
- Will cook in 'next'.
937
+ Will merge to 'master'.
938
939
940
* jk/fast-import-empty-ls (2013-06-23) 4 commits
918
- (merged to 'next' on 2013-07-22 at d26dab6)
941
+ (merged to 'next' on 2013-08-28 at 876a39d)
942
+ fast-import: allow moving the root tree
943
+ fast-import: allow ls or filecopy of the root tree
944
+ fast-import: set valid mode on root tree in "ls"
@@ -923,11 +946,11 @@ of the repositories listed at
946
947
Originally merged to 'next' on 2013-07-22
948
926
- Will cook in 'next'.
949
+ Will merge to 'master'.
950
951
952
* jc/diff-filter-negation (2013-07-19) 6 commits
930
- (merged to 'next' on 2013-07-22 at 80d167d)
953
+ (merged to 'next' on 2013-08-28 at 5cc7720)
954
+ diff: deprecate -q option to diff-files
955
+ diff: allow lowercase letter to specify what change class to exclude
956
+ diff: reject unknown change class given to --diff-filter
@@ -944,13 +967,12 @@ of the repositories listed at
967
everything but deletion) and deprecate "diff-files -q" which did
968
the same thing as "--diff-filter=d".
969
947
- Will cook in 'next'.
970
+ Will merge to 'master' in the second batch.
971
972
973
* nd/magic-pathspec (2013-07-23) 48 commits
951
- (merged to 'next' on 2013-07-23 at 784c3a1)
974
+ (merged to 'next' on 2013-08-28 at 305c6e9)
975
+ rm: do not set a variable twice without intermediate reading.
953
- (merged to 'next' on 2013-07-22 at 39f7194)
976
+ t6131 - skip tests if on case-insensitive file system
977
+ parse_pathspec: accept :(icase)path syntax
978
+ pathspec: support :(glob) syntax
@@ -1006,11 +1028,11 @@ of the repositories listed at
1028
characters, the latter of which cannot express magic pathspecs
1029
(e.g. ":(icase)makefile" that matches both Makefile and makefile).
1030
1009
- Will cook in 'next'.
1031
+ Will merge to 'master' in the second batch.
1032
1033
1034
* jc/check-x-z (2013-07-11) 4 commits
1013
- (merged to 'next' on 2013-07-15 at 62751bc)
1035
+ (merged to 'next' on 2013-08-28 at a7670ce)
1036
+ check-attr -z: a single -z should apply to both input and output
1037
+ check-ignore -z: a single -z should apply to both input and output
1038
+ check-attr: the name of the character is NUL, not NULL
@@ -1022,16 +1044,15 @@ of the repositories listed at
1044
(with --stdin) and its output, but "git check-attr -z" ignored the
1045
option on the output side.
1046
1025
- This is potentially a backward incompatible fix. I am tempted to
1026
- merge this to and keep it in 'next' for a while to see if anybody
1027
- screams before deciding if we want to do anything to help existing
1028
- users (there may be none).
1047
+ This is potentially a backward incompatible fix. Let's see if
1048
+ anybody screams before deciding if we want to do anything to help
1049
+ existing users (there may be none).
1050
1030
- Will cook in 'next'.
1051
+ Will merge to 'master'.
1052
1053
1054
* ms/fetch-prune-configuration (2013-07-18) 1 commit
1034
- (merged to 'next' on 2013-07-21 at 7ffb690)
1055
+ (merged to 'next' on 2013-08-28 at fa6ffc7)
1056
+ fetch: make --prune configurable
1057
1058
Originally merged to 'next' on 2013-07-21
@@ -1044,13 +1065,12 @@ of the repositories listed at
1065
remote.*.prune should not be just a boolean, but a 4-way "none",
1066
"push", "fetch", "both"?
1067
1047
- Will cook in 'next'.
1068
+ Will merge to 'master' in the second batch.
1069
1070
1071
* km/svn-1.8-serf-only (2013-07-18) 3 commits
1051
- (merged to 'next' on 2013-07-19 at ab8d034)
1072
+ (merged to 'next' on 2013-08-28 at 1119134)
1073
+ Git.pm: revert _temp_cache use of temp_is_locked
1053
- (merged to 'next' on 2013-07-12 at 70e0b95)
1074
+ git-svn: allow git-svn fetching to work using serf
1075
+ Git.pm: add new temp_is_locked function
1076
@@ -1059,7 +1079,7 @@ of the repositories listed at
1079
Subversion 1.8.0 that was recently released breaks older subversion
1080
clients coming over http/https in various ways.
1081
1062
- Will cook in 'next'.
1082
+ Will merge to 'master'.
1083
1084
1085
* tr/merge-recursive-index-only (2013-07-07) 3 commits
@@ -1071,12 +1091,10 @@ of the repositories listed at
1091
1092
1093
* jc/push-cas (2013-08-02) 9 commits
1074
- (merged to 'next' on 2013-08-05 at 34f4cf3)
1094
+ (merged to 'next' on 2013-08-28 at 784281f)
1095
+ push: teach --force-with-lease to smart-http transport
1096
+ send-pack: fix parsing of --force-with-lease option
1077
- (merged to 'next' on 2013-08-01 at a7604ee)
1097
+ t5540/5541: smart-http does not support "--force-with-lease"
1079
- (merged to 'next' on 2013-07-23 at 72371b0)
1098
+ t5533: test "push --force-with-lease"
1099
+ push --force-with-lease: tie it all together
1100
+ push --force-with-lease: implement logic to populate old_sha1_expect[]
@@ -1100,11 +1118,11 @@ of the repositories listed at
1118
defeating the safety pretty easily). It is suitable only for the
1119
simplest workflows, and it may hurt users more than it helps them.
1120
1103
- Will cook in 'next'.
1121
+ Will merge to 'master' in the second batch.
1122
1123
1124
* jc/pull-training-wheel (2013-07-19) 1 commit
1107
- (merged to 'next' on 2013-07-22 at 748180e)
1125
+ (merged to 'next' on 2013-08-28 at c39bd15)
1126
+ pull: require choice between rebase/merge on non-fast-forward pull
1127
1128
Originally merged to 'next' on 2013-07-22
@@ -1120,7 +1138,7 @@ of the repositories listed at
1138
1139
for full discussion.
1140
1123
- Will cook in 'next'.
1141
+ Will merge to 'master' in the second batch.
1142
1143
1144
* jc/reflog-doc (2013-06-19) 1 commit
@@ -1169,30 +1187,24 @@ of the repositories listed at
1187
[Discarded]
1188
1189
* jh/remote-hg-fetch-fix (2013-07-25) 2 commits
1172
- (merged to 'next' on 2013-07-25 at 33161ad)
1173
- + Revert "remotes-hg: bugfix for fetching non local remotes"
1174
- (merged to 'next' on 2013-07-24 at 9c96641)
1175
- + remotes-hg: bugfix for fetching non local remotes
1176
-
1177
- Originally merged to 'next' on 2013-07-25
1190
+ . Revert "remotes-hg: bugfix for fetching non local remotes"
1191
+ . remotes-hg: bugfix for fetching non local remotes
1192
1179
- Reverted.
1193
1181
- Waiting for the final patch to replace, after discussion settles.
1194
+* km/http-curl-config-per-url (2013-07-31) 7 commits
1195
+ . Revert km/http-curl-config-per-url in its entirety
1196
+ . docs: update http.<url>.* options documentation
1197
+ . config: allow http.<url>.* any user matching
1198
+ . tests: add new test for the url_normalize function
1199
+ . config: improve support for http.<url>.* settings
1200
+ . config: add support for http.<url>.* settings
1201
+ . http.c: fix parsing of http.sslCertPasswordProtected variable
1202
1203
+ Reverted to be replaced with a reroll (jc/url-match topic).
1204
1184
-* km/http-curl-config-per-url (2013-07-31) 7 commits
1185
- (merged to 'next' on 2013-07-31 at e88aad5)
1186
- + Revert km/http-curl-config-per-url in its entirety
1187
- (merged to 'next' on 2013-07-25 at 531e8cb)
1188
- + docs: update http.<url>.* options documentation
1189
- (merged to 'next' on 2013-07-23 at f84689b)
1190
- + config: allow http.<url>.* any user matching
1191
- + tests: add new test for the url_normalize function
1192
- + config: improve support for http.<url>.* settings
1193
- + config: add support for http.<url>.* settings
1194
- + http.c: fix parsing of http.sslCertPasswordProtected variable
1205
1196
- Originally merged to 'next' on 2013-07-31
1206
+* sb/fsck-opt-bool (2013-07-29) 1 commit
1207
+ . fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL
1208
1198
- Reverted to be replaced with a reroll (jc/url-match topic).
1209
+ sb/parseopt-boolean-removal contains the moral equivalent of this
1210
+ change.