What's cooking (2013/10 #06)
Junio C Hamano committed
Oct 25, 2013 at 16:22 UTC
1b44bb1d23ea2696eec3c2847da969632e5151da
1 file changed
+191
-123
whats-cooking.txt
+191
-123
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2013, #05; Wed, 23)
3
+Subject: What's cooking in git.git (Oct 2013, #06; Fri, 25)
4
X-master-at: 3d092bfc6f2d9a998967979f926c661e9762601c
5
-X-next-at: 1c32b8d241eeeb98707f52c99ac71d905c99b673
5
+X-next-at: 4bebb6611df42b82d24d2e1efd8b270ca0779f33
6
7
-What's cooking in git.git (Oct 2013, #05; Wed, 23)
7
+What's cooking in git.git (Oct 2013, #06; Fri, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -17,152 +17,154 @@ of the repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
20
-[Graduated to "master"]
20
+[New Topics]
21
22
-* bc/gnome-keyring (2013-10-16) 16 commits
23
- (merged to 'next' on 2013-10-18 at 25024aa)
24
- + contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring
25
- + contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring
26
- + contrib/git-credential-gnome-keyring.c: report failure to store password
27
- + contrib/git-credential-gnome-keyring.c: use glib messaging functions
28
- + contrib/git-credential-gnome-keyring.c: use glib memory allocation functions
29
- + contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords
30
- + contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds
31
- + contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()
32
- + contrib/git-credential-gnome-keyring.c: set Gnome application name
33
- + contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing
34
- + contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t
35
- + contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly
36
- + contrib/git-credential-gnome-keyring.c: add static where applicable
37
- + contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.
38
- + contrib/git-credential-gnome-keyring.c: remove unused die() function
39
- + contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations
22
+* bc/http-100-continue (2013-10-23) 1 commit
23
+ - http: add option to enable 100 Continue responses
24
41
- Cleanups and tweaks for credential handling to work with ancient versions
42
- of the gnome-keyring library that are still in use.
25
+ Conditionally allow "100 Continue" responses to help use of
26
+ GSS-Negotiate authentication scheme over HTTP transport.
27
28
+ Seems to be still under discussion.
29
45
-* hu/cherry-pick-previous-branch (2013-10-10) 1 commit
46
- (merged to 'next' on 2013-10-14 at 090934f)
47
- + cherry-pick: handle "-" after parsing options
30
49
- "git cherry-pick" without further options would segfault.
31
+* jc/merge-base-reflog (2013-10-25) 2 commits
32
+ - merge-base: teach "--fork-point" mode
33
+ - merge-base: use OPT_CMDMODE and clarify the command line parsing
34
51
- Could use a follow-up to handle '-' after argv[1] better.
35
+ Code the logic in "pull --rebase" that figures out a fork point
36
+ from reflog entries in C.
37
38
54
-* jc/pack-objects (2013-02-04) 1 commit
55
- (merged to 'next' on 2013-10-14 at 8e8feb6)
56
- + pack-objects: shrink struct object_entry
39
+* jk/date-c-double-semicolon (2013-10-24) 1 commit
40
+ - drop redundant semicolon in empty while
41
42
+ Will merge to 'next'.
43
59
-* jc/prompt-upstream (2013-10-14) 1 commit
60
- (merged to 'next' on 2013-10-14 at 270ef7b)
61
- + git-prompt.sh: optionally show upstream branch name
44
63
- An enhancement to the GIT_PS1_SHOWUPSTREAM facility.
45
+* jk/for-each-ref-skip-parsing (2013-10-24) 1 commit
46
+ - for-each-ref: avoid loading objects to print %(objectname)
47
48
+ Will merge to 'next'.
49
66
-* mg/more-textconv (2013-05-10) 7 commits
67
- (merged to 'next' on 2013-10-14 at 8a12490)
68
- + grep: honor --textconv for the case rev:path
69
- + grep: allow to use textconv filters
70
- + t7008: demonstrate behavior of grep with textconv
71
- + cat-file: do not die on --textconv without textconv filters
72
- + show: honor --textconv for blobs
73
- + diff_opt: track whether flags have been set explicitly
74
- + t4030: demonstrate behavior of show with textconv
50
76
- Make "git grep" and "git show" pay attention to --textconv when
77
- dealing with blob objects.
51
+* jk/pack-bitmap (2013-10-25) 19 commits
52
+ - pack-bitmap: implement optional name_hash cache
53
+ - t: add basic bitmap functionality tests
54
+ - repack: consider bitmaps when performing repacks
55
+ - repack: handle optional files created by pack-objects
56
+ - repack: turn exts array into array-of-struct
57
+ - repack: stop using magic number for ARRAY_SIZE(exts)
58
+ - pack-objects: implement bitmap writing
59
+ - rev-list: add bitmap mode to speed up object lists
60
+ - pack-objects: use bitmaps when packing objects
61
+ - pack-bitmap: add support for bitmap indexes
62
+ - documentation: add documentation for the bitmap format
63
+ - ewah: compressed bitmap implementation
64
+ - compat: add endianness helpers
65
+ - sha1_file: export `git_open_noatime`
66
+ - revision: allow setting custom limiter function
67
+ - pack-objects: factor out name_hash
68
+ - pack-objects: refactor the packing list
69
+ - revindex: export new APIs
70
+ - sha1write: make buffer const-correct
71
+
72
+ Borrows the bitmap index into packfiles from JGit to speed up
73
+ enumeration of objects involved in a commit range without having to
74
+ fully traverse the history.
75
+
76
+
77
+* jk/refs-c-squelch-gcc (2013-10-24) 1 commit
78
+ - silence gcc array-bounds warning
79
80
+ Will merge to 'next'.
81
80
-* po/dot-url (2013-10-15) 3 commits
81
- (merged to 'next' on 2013-10-15 at 312d0af)
82
- + doc/cli: make "dot repository" an independent bullet point
83
- (merged to 'next' on 2013-09-20 at 6a12786)
84
- + config doc: update dot-repository notes
85
- + doc: command line interface (cli) dot-repository dwimmery
82
87
- Explain how '.' can be used to refer to the "current repository"
88
- in the documentation.
83
+* jk/robustify-parse-commit (2013-10-24) 6 commits
84
+ - checkout: do not die when leaving broken detached HEAD
85
+ - use parse_commit_or_die instead of custom message
86
+ - use parse_commit_or_die instead of segfaulting
87
+ - assume parse_commit checks for NULL commit
88
+ - assume parse_commit checks commit->object.parsed
89
+ - log_tree_diff: die when we fail to parse a commit
90
90
---------------------------------------------------
91
-[New Topics]
91
+ Will merge to 'next' after taking another look.
92
93
-* ap/remote-hg-unquote-cquote (2013-10-23) 1 commit
94
- - remote-hg: unquote C-style paths when exporting
93
96
- A fast-import stream expresses a pathname with funny characters by
97
- quoting them in C style; remote-hg remote helper forgot to unquote
98
- such a path.
94
+* mh/fetch-tags-in-addition-to-normal-refs (2013-10-24) 16 commits
95
+ - fetch, remote: properly convey --no-prune options to subprocesses
96
+ - builtin/remote.c:update(): use struct argv_array
97
+ - builtin/remote.c: reorder function definitions
98
+ - query_refspecs(): move some constants out of the loop
99
+ - fetch --prune: prune only based on explicit refspecs
100
+ - SQUASH??? --tags is no longer a short-hand
101
+ - fetch --tags: fetch tags *in addition to* other stuff
102
+ - builtin/fetch.c: reorder function definitions
103
+ - ref_remove_duplicates(): improve documentation comment
104
+ - ref_remove_duplicates(): simplify function
105
+ - ref_remove_duplicates(): avoid redundant bisection
106
+ - get_ref_map(): rename local variables
107
+ - api-remote.txt: correct section "struct refspec"
108
+ - t5510: check that "git fetch --prune --tags" does not prune branches
109
+ - t5510: prepare test refs more straightforwardly
110
+ - t5510: use the correct tag name in test
111
100
- Will merge to 'next'.
112
+ Some questionable paragraphs in the doc updates, but other than
113
+ that looks reasonably solid.
114
115
103
-* jl/pack-transfer-avoid-double-close (2013-10-23) 1 commit
104
- - Clear fd after closing to avoid double-close error
105
-
106
- The codepath that send_pack() calls pack_objects() mistakenly
107
- closed the same file descriptor twice, leading to potentially
108
- closing a wrong file descriptor that was opened in the meantime.
116
+* nd/lift-path-max (2013-10-24) 2 commits
117
+ - checkout_entry(): clarify the use of topath[] parameter
118
+ - entry.c: convert checkout_entry to use strbuf
119
120
Will merge to 'next'.
111
- Needs to be merged later to 'maint'.
121
122
114
-* nd/magic-pathspec (2013-10-22) 1 commit
115
- - Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
116
-
117
- All callers to parse_pathspec() must choose between getting no
118
- pathspec or one path that is limited to the current directory
119
- when there is no paths given on the command line, but there were
120
- two callers that violated this rule, triggering a BUG().
123
+* jk/pack-corruption-post-mortem (2013-10-25) 1 commit
124
+ - howto: add article on recovering a corrupted object
125
126
Will merge to 'next'.
127
128
125
-* sb/git-svn-docs-indent-with-ht (2013-10-22) 1 commit
126
- - git-svn docs: Use tabs consistently within the ascii doc
127
-
128
- Will merge to 'next'.
129
-
129
+* jk/reset-p-current-head-fix (2013-10-25) 2 commits
130
+ - reset: pass real rev name to add--interactive
131
+ - add-interactive: handle unborn branch in patch mode
132
131
-* tr/gitk-doc-update (2013-10-22) 1 commit
132
- - Documentation: revamp gitk(1)
133
+ "git reset -p HEAD" has codepath to special case it from resetting
134
+ to contents of other commits, but recent change broke it.
135
136
Will merge to 'next'.
137
138
137
-* tr/valgrind-test-fix (2013-10-22) 2 commits
138
- - Revert "test-lib: allow prefixing a custom string before "ok N" etc."
139
- - Revert "test-lib: support running tests under valgrind in parallel"
140
-
141
- Will merge to 'next'.
139
+* mf/graph-show-root (2013-10-25) 1 commit
140
+ - graph.c: mark root commit differently
141
142
+ Needs adjustments to some tests.
143
144
-* sb/repack-in-c (2013-10-22) 1 commit
145
- (merged to 'next' on 2013-10-23 at 5d7ac72)
146
- + Reword repack documentation to no longer state it's a script
144
148
- Finishing touches to update documentation.
145
+* nv/parseopt-opt-arg (2013-10-25) 1 commit
146
+ - rev-parse --parseopt: add the --sticked-long mode
147
150
- Will merge to 'master'.
148
+ Enhance "rev-parse --parseopt" mode to help parsing options with
149
+ an optional parameter.
150
151
--------------------------------------------------
152
[Stalled]
153
154
* np/pack-v4 (2013-09-18) 90 commits
156
- - packv4-parse.c: add tree offset caching
157
- - t1050: replace one instance of show-index with verify-pack
158
- - index-pack, pack-objects: allow creating .idx v2 with .pack v4
159
- - unpack-objects: decode v4 trees
160
- - unpack-objects: allow to save processed bytes to a buffer
155
+ . packv4-parse.c: add tree offset caching
156
+ . t1050: replace one instance of show-index with verify-pack
157
+ . index-pack, pack-objects: allow creating .idx v2 with .pack v4
158
+ . unpack-objects: decode v4 trees
159
+ . unpack-objects: allow to save processed bytes to a buffer
160
- ...
161
162
Nico and Duy advancing the eternal vaporware pack-v4. This is here
163
primarily for wider distribution of the preview edition.
164
165
+ Temporarily ejected from 'pu', to try out jk/pack-bitmap, which
166
+ this topic conflicts with.
167
+
168
169
* sc/doc-howto-dumb-http (2013-10-16) 1 commit
170
. doc/howto: warn about (dumb)http server document being too old
@@ -229,22 +231,6 @@ of the repositories listed at
231
$gmane/228294
232
233
232
-* jh/shorten-refname (2013-05-07) 4 commits
233
- - t1514: refname shortening is done after dereferencing symbolic refs
234
- - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
235
- - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
236
- - t1514: Add tests of shortening refnames in strict/loose mode
237
-
238
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
239
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
240
- "origin/HEAD", which is fixed with this series (if it is a symbolic
241
- ref that points at remotes/origin/something, then it should show
242
- "origin/something" and it already does).
243
-
244
- Expecting a reroll, as an early part of a larger series.
245
- $gmane/225137
246
-
247
-
234
* jc/format-patch (2013-04-22) 2 commits
235
- format-patch: --inline-single
236
- format-patch: rename "no_inline" field
@@ -280,6 +266,66 @@ of the repositories listed at
266
--------------------------------------------------
267
[Cooking]
268
269
+* ap/remote-hg-unquote-cquote (2013-10-23) 1 commit
270
+ - remote-hg: unquote C-style paths when exporting
271
+
272
+ A fast-import stream expresses a pathname with funny characters by
273
+ quoting them in C style; remote-hg remote helper forgot to unquote
274
+ such a path.
275
+
276
+ Will merge to 'next'.
277
+
278
+
279
+* jl/pack-transfer-avoid-double-close (2013-10-23) 1 commit
280
+ - Clear fd after closing to avoid double-close error
281
+
282
+ The codepath that send_pack() calls pack_objects() mistakenly
283
+ closed the same file descriptor twice, leading to potentially
284
+ closing a wrong file descriptor that was opened in the meantime.
285
+
286
+ Will merge to 'next'.
287
+ Needs to be merged later to 'maint'.
288
+
289
+
290
+* nd/magic-pathspec (2013-10-22) 1 commit
291
+ - Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
292
+
293
+ All callers to parse_pathspec() must choose between getting no
294
+ pathspec or one path that is limited to the current directory
295
+ when there is no paths given on the command line, but there were
296
+ two callers that violated this rule, triggering a BUG().
297
+
298
+ Will merge to 'next'.
299
+
300
+
301
+* sb/git-svn-docs-indent-with-ht (2013-10-22) 1 commit
302
+ - git-svn docs: Use tabs consistently within the ascii doc
303
+
304
+ Will merge to 'next'.
305
+
306
+
307
+* tr/gitk-doc-update (2013-10-22) 1 commit
308
+ - Documentation: revamp gitk(1)
309
+
310
+ Will merge to 'next'.
311
+
312
+
313
+* tr/valgrind-test-fix (2013-10-22) 2 commits
314
+ - Revert "test-lib: allow prefixing a custom string before "ok N" etc."
315
+ - Revert "test-lib: support running tests under valgrind in parallel"
316
+
317
+ Will merge to 'next'.
318
+
319
+
320
+* sb/repack-in-c (2013-10-22) 1 commit
321
+ (merged to 'next' on 2013-10-23 at 5d7ac72)
322
+ + Reword repack documentation to no longer state it's a script
323
+
324
+ Finishing touches to update documentation.
325
+
326
+ Will merge to 'master'.
327
+
328
+
329
* mm/checkout-auto-track-fix (2013-10-18) 2 commits
330
- checkout: proper error message on 'git checkout foo bar --'
331
- checkout: allow dwim for branch creation for "git checkout $branch --"
@@ -387,13 +433,15 @@ of the repositories listed at
433
Will merge to 'master'.
434
435
390
-* jk/http-auth-redirects (2013-10-14) 9 commits
391
- - remote-curl: rewrite base url from info/refs redirects
392
- - remote-curl: store url as a strbuf
393
- - remote-curl: make refs_url a strbuf
394
- - http: update base URLs when we see redirects
395
- - http: provide effective url to callers
396
- - http: hoist credential request out of handle_curl_result
436
+* jk/http-auth-redirects (2013-10-24) 10 commits
437
+ (merged to 'next' on 2013-10-24 at 4bebb66)
438
+ + http.c: Spell the null pointer as NULL
439
+ + remote-curl: rewrite base url from info/refs redirects
440
+ + remote-curl: store url as a strbuf
441
+ + remote-curl: make refs_url a strbuf
442
+ + http: update base URLs when we see redirects
443
+ + http: provide effective url to callers
444
+ + http: hoist credential request out of handle_curl_result
445
(merged to 'next' on 2013-10-14 at a0642be)
446
+ http: refactor options to http_get_*
447
+ http_request: factor out curlinfo_strbuf
@@ -402,7 +450,7 @@ of the repositories listed at
450
Handle the case where http transport gets redirected during the
451
authorization request better.
452
405
- Will merge to 'next'.
453
+ Will merge to 'master'.
454
455
456
* jl/submodule-mv (2013-10-13) 1 commit
@@ -515,3 +563,23 @@ of the repositories listed at
563
- diff: remove "diff-files -q" in a version of Git in a distant future
564
565
Will merge to and cook in 'next' until a distant future.
566
+
567
+--------------------------------------------------
568
+[Discarded]
569
+
570
+* jh/shorten-refname (2013-05-07) 4 commits
571
+ . t1514: refname shortening is done after dereferencing symbolic refs
572
+ . shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
573
+ . t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
574
+ . t1514: Add tests of shortening refnames in strict/loose mode
575
+
576
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
577
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
578
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
579
+ ref that points at remotes/origin/something, then it should show
580
+ "origin/something" and it already does).
581
+
582
+ Has been expecting a reroll, as an early part of a larger series.
583
+ $gmane/225137
584
+
585
+ Discarded due to inactivity, without prejudice.