What's cooking (2013/10 #01)
Jonathan Nieder committed
Oct 14, 2013 at 11:43 UTC
b849911267759f146264a211e793140cb9557faa
1 file changed
+110
-138
whats-cooking.txt
+110
-138
@@ -1,171 +1,101 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2013, #08; Wed, 25)
4
-X-master-at: 5636a20070c80dec23cc6d6180cb1dd958e23bca
5
-X-next-at: 4eb0c1432dc51cbf104157b7b61914bbe4a0191d
3
+Subject: What's cooking in git.git (Oct 2013, #01; Mon, 14)
4
+X-master-at: 774282d16ab5aa2ec4b8bb7fa4ad83b0622ee778
5
+X-next-at: 8a12490ddc9ceec4537b17f1339ff3a0171a7ce4
6
7
-What's cooking in git.git (Sep 2013, #08; Wed, 25)
7
+What's cooking in git.git (Oct 2013, #01; Mon, 14)
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
-The fifth batch of topics are in 'master'.
14
+Junio is back (yay!). Here is the state of topics in flight. As
15
+usual, help moving topics forward and pointing out patches that fell
16
+through the cracks is appreciated.
17
18
You can find the changes described here in the integration branches at
19
20
+ https://googlers.googlesource.com/jrn/git
21
git://repo.or.cz/git/jrn.git
19
- http://repo.or.cz/r/git/jrn.git
20
-
21
-Or view the web interface:
22
-
23
- http://repo.or.cz/w/git/jrn.git
24
-
25
-I'll probably be releasing 1.8.4.1 tomorrow. If you have time to
26
-experiment with "maint" or "master" to find any remaining problems
27
-until then, that will be very welcome.
22
+ git://gitorious.org/git/jrn.git
23
+ https://github.com/jrn/git
24
25
--------------------------------------------------
30
-[Graduated to "master"]
31
-
32
-* bc/submodule-status-ignored (2013-09-11) 3 commits
33
- (merged to 'next' on 2013-09-11 at 9f66712)
34
- + Improve documentation concerning the status.submodulesummary setting
35
- (merged to 'next' on 2013-09-10 at a417960)
36
- + submodule: don't print status output with ignore=all
37
- + submodule: fix confusing variable name
38
-
39
-
40
-* bp/mediawiki-infinite-loop-fix (2013-09-23) 1 commit
41
- - git-remote-mediawiki: bugfix for pages w/ >500 revisions
42
-
43
- The mediawiki:: remote helper would hang while handling results from
44
- queries with more than 500 results against version 1.21 or newer of
45
- the Mediawiki server.
26
+[New Topics]
27
28
+* ak/submodule-foreach-quoting (2013-09-27) 1 commit
29
+ (merged to 'next' on 2013-10-14 at d77c5f1)
30
+ + submodule foreach: skip eval for more than one argument
31
48
-* cc/replace-with-the-same-type (2013-09-09) 8 commits
49
- (merged to 'next' on 2013-09-17 at 34b5bb7)
50
- + Doc: 'replace' merge and non-merge commits
51
- + t6050-replace: use some long option names
52
- + replace: allow long option names
53
- + Documentation/replace: add Creating Replacement Objects section
54
- + t6050-replace: add test to clean up all the replace refs
55
- + t6050-replace: test that objects are of the same type
56
- + Documentation/replace: state that objects must be of the same type
57
- + replace: forbid replacing an object with one of a different type
32
+ A behavior change, but a worthwhile one: "git submodule foreach"
33
+ was treating its arguments as part of a single command to be
34
+ concatenated and passed to a shell, making writing buggy
35
+ scripts too easy.
36
59
- Using the replace mechanism to swap an object with another object
60
- of a different type can introduce inconsistency (e.g. a tree
61
- expects an object name to refer to a blob, but the blob object can
62
- be mistakenly or maliciously replaced with an object with a
63
- different type). Attempt to forbid such.
37
+ This patch preserves the old "just pass it to the shell" behavior
38
+ when a single argument is passed to 'git submodule foreach' and
39
+ moves to a new "skip the shell and use the arguments passed
40
+ unmolested" behavior when more than one argument is passed.
41
42
+ The old behavior (always concatenating and passing to the shell)
43
+ was similar to the 'ssh' command, while the new behavior (switching
44
+ on the number of arguments) is what 'xterm -e' does.
45
66
-* es/contacts-in-subdir (2013-09-17) 1 commit
67
- (merged to 'next' on 2013-09-20 at d67164f)
68
- + contacts: fix to work in subdirectories
46
+ May need more thought to make sure this change is advertised well
47
+ so that scripts that used multiple arguments but added their own
48
+ extra layer of quoting are not broken.
49
70
- Allows the contacts (in contrib/) script to run from inside a
71
- subdirectory.
50
+* ew/keepalive (2013-10-14) 1 commit
51
+ (merged to 'next' on 2013-10-14 at 24d786f)
52
+ + http: enable keepalive on TCP sockets
53
54
74
-* jc/push-cas (2013-09-20) 1 commit
75
- (merged to 'next' on 2013-09-20 at 5e1e7cc)
76
- + t5541: mark passing c-a-s test as success
55
+* hu/cherry-pick-previous-branch (2013-10-10) 1 commit
56
+ (merged to 'next' on 2013-10-14 at 090934f)
57
+ + cherry-pick: handle "-" after parsing options
58
78
- A touch-up to finish off a recently added feature.
59
+ "git cherry-pick" without further options would segfault.
60
61
+ Could use a follow-up to handle '-' after argv[1] better.
62
81
-* jc/strcasecmp-pure-inline (2013-09-12) 1 commit
82
- (merged to 'next' on 2013-09-20 at 7142d08)
83
- + mailmap: work around implementations with pure inline strcasecmp
63
85
- Work around MinGW <string.h> header that does not declare strcasecmp
86
- whose address cannot be taken.
64
+* jc/pack-objects (2013-02-04) 1 commit
65
+ (merged to 'next' on 2013-10-14 at 8e8feb6)
66
+ + pack-objects: shrink struct object_entry
67
68
89
-* jk/shortlog-tolerate-broken-commit (2013-09-18) 1 commit
90
- (merged to 'next' on 2013-09-20 at 9c85c02)
91
- + shortlog: ignore commits with missing authors
69
+* jc/prompt-upstream (2013-10-14) 1 commit
70
+ (merged to 'next' on 2013-10-14 at 270ef7b)
71
+ + git-prompt.sh: optionally show upstream branch name
72
73
+ An enhancement to the GIT_PS1_SHOWUPSTREAM facility.
74
94
-* kb/msvc-compile (2013-09-11) 5 commits
95
- (merged to 'next' on 2013-09-17 at a9bcbb5)
96
- + Windows: do not redefine _WIN32_WINNT
97
- + MinGW: Fix stat definitions to work with MinGW runtime version 4.0
98
- + MSVC: fix stat definition hell
99
- + MSVC: fix compile errors due to macro redefinitions
100
- + MSVC: fix compile errors due to missing libintl.h
75
102
- Build updates for Windows port.
76
+* jk/http-auth-redirects (2013-09-30) 3 commits
77
+ (merged to 'next' on 2013-10-14 at a0642be)
78
+ + http: refactor options to http_get_*
79
+ + http_request: factor out curlinfo_strbuf
80
+ + http_get_file: style fixes
81
82
+ Cleanups from the beginning of a larger series.
83
105
-* nd/fetch-pack-error-reporting-fix (2013-09-18) 1 commit
106
- (merged to 'next' on 2013-09-20 at fefa04f)
107
- + fetch-pack.c: show correct command name that fails
84
109
- When "fetch-pack" detected an error from spawned "index-pack" or
110
- "unpack-objects", it did not report the failed program name
111
- correctly when a shallow repository is involved.
85
+* jl/submodule-mv (2013-10-13) 1 commit
86
+ - mv: Fix spurious warning when moving a file in presence of submodules
87
88
+ Moving a regular file in a repository with a .gitmodules file was
89
+ producing a warning 'Could not find section in .gitmodules where
90
+ path=<filename>'.
91
114
-* nd/unpack-entry-optim-in-pack-objects (2013-09-13) 1 commit
115
- (merged to 'next' on 2013-09-17 at 00f7335)
116
- + pack-objects: no crc check when the cached version is used
92
+ The test can use a little cleanup. Otherwise looks good.
93
118
- The codepath to use data from packfiles that is only exercised in
119
- pack-objects unnecessarily checked crc checksum of the pack data,
120
- even when it ends up using in-core copy that it got by reading from
121
- the pack (at which point the checksum was validated).
94
95
+* yt/shortened-rename (2013-10-13) 1 commit
96
+ - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible.
97
124
-* sg/complete-untracked-filter (2013-09-19) 1 commit
125
- (merged to 'next' on 2013-09-20 at 798d0b9)
126
- + completion: improve untracked directory filtering for filename completion
127
-
128
---------------------------------------------------
129
-[New Topics]
130
-
131
-* bc/gnome-keyring (2013-09-23) 15 commits
132
- - contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring
133
- - contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring
134
- - contrib/git-credential-gnome-keyring.c: report failure to store password
135
- - contrib/git-credential-gnome-keyring.c: use glib messaging functions
136
- - contrib/git-credential-gnome-keyring.c: use glib memory allocation functions
137
- - contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords
138
- - contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds
139
- - contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()
140
- - contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing
141
- - contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t
142
- - contrib/git-credential-gnome-keyring.c: set Gnome application name
143
- - contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly
144
- - contrib/git-credential-gnome-keyring.c: add static where applicable
145
- - contrib/git-credential-gnome-keyring.c: remove unused die() function
146
- - contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations
147
-
148
- Cleanups and tweaks for credential handling to work with ancient versions
149
- of the gnome-keyring library that are still in use.
150
-
151
- This is version 1 of the series, to give it more exposure. Waiting for
152
- the series to stabilize before including in 'next'.
153
-
154
-
155
-* kb/fast-hashmap (2013-09-25) 6 commits
156
- - fixup! diffcore-rename.c: simplify finding exact renames
157
- - diffcore-rename.c: use new hash map implementation
158
- - diffcore-rename.c: simplify finding exact renames
159
- - diffcore-rename.c: move code around to prepare for the next patch
160
- - buitin/describe.c: use new hash map implementation
161
- - add a hashtable implementation that supports O(1) removal
162
-
163
- Improvements to our hash table to get it to meet the needs of the
164
- msysgit fscache project, with some nice performance improvements.
165
-
166
- Looks promising. Needs style review and a sanity-check on the
167
- design before including in 'next'. Expecting a reroll once review
168
- settles down.
98
+ Expecting a reroll.
99
100
--------------------------------------------------
101
[Stalled]
@@ -224,13 +154,14 @@ until then, that will be very welcome.
154
155
156
* mg/more-textconv (2013-05-10) 7 commits
227
- - grep: honor --textconv for the case rev:path
228
- - grep: allow to use textconv filters
229
- - t7008: demonstrate behavior of grep with textconv
230
- - cat-file: do not die on --textconv without textconv filters
231
- - show: honor --textconv for blobs
232
- - diff_opt: track whether flags have been set explicitly
233
- - t4030: demonstrate behavior of show with textconv
157
+ (merged to 'next' on 2013-10-14 at 8a12490)
158
+ + grep: honor --textconv for the case rev:path
159
+ + grep: allow to use textconv filters
160
+ + t7008: demonstrate behavior of grep with textconv
161
+ + cat-file: do not die on --textconv without textconv filters
162
+ + show: honor --textconv for blobs
163
+ + diff_opt: track whether flags have been set explicitly
164
+ + t4030: demonstrate behavior of show with textconv
165
166
Make "git grep" and "git show" pay attention to --textconv when
167
dealing with blob objects.
@@ -275,6 +206,46 @@ until then, that will be very welcome.
206
--------------------------------------------------
207
[Cooking]
208
209
+* bc/gnome-keyring (2013-09-23) 15 commits
210
+ - contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring
211
+ - contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring
212
+ - contrib/git-credential-gnome-keyring.c: report failure to store password
213
+ - contrib/git-credential-gnome-keyring.c: use glib messaging functions
214
+ - contrib/git-credential-gnome-keyring.c: use glib memory allocation functions
215
+ - contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords
216
+ - contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds
217
+ - contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()
218
+ - contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing
219
+ - contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t
220
+ - contrib/git-credential-gnome-keyring.c: set Gnome application name
221
+ - contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly
222
+ - contrib/git-credential-gnome-keyring.c: add static where applicable
223
+ - contrib/git-credential-gnome-keyring.c: remove unused die() function
224
+ - contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations
225
+
226
+ Cleanups and tweaks for credential handling to work with ancient versions
227
+ of the gnome-keyring library that are still in use.
228
+
229
+ This is version 1 of the series, to give it more exposure. Waiting for
230
+ the series to stabilize before including in 'next'.
231
+
232
+
233
+* kb/fast-hashmap (2013-09-25) 6 commits
234
+ - fixup! diffcore-rename.c: simplify finding exact renames
235
+ - diffcore-rename.c: use new hash map implementation
236
+ - diffcore-rename.c: simplify finding exact renames
237
+ - diffcore-rename.c: move code around to prepare for the next patch
238
+ - buitin/describe.c: use new hash map implementation
239
+ - add a hashtable implementation that supports O(1) removal
240
+
241
+ Improvements to our hash table to get it to meet the needs of the
242
+ msysgit fscache project, with some nice performance improvements.
243
+
244
+ Looks promising. Needs style review and a sanity-check on the
245
+ design before including in 'next'. Expecting a reroll once review
246
+ settles down.
247
+
248
+
249
* jc/revision-range-unpeel (2013-09-20) 2 commits
250
- (possible fixup) jc/revision-range-unpeel - peel only when necessary
251
- revision: do not peel tags used in range notation
@@ -366,10 +337,11 @@ until then, that will be very welcome.
337
Will merge to 'master'.
338
339
369
-* jx/relative-path-regression-fix (2013-09-20) 3 commits
340
+* jx/relative-path-regression-fix (2013-10-14) 3 commits
341
- Use simpler relative_path when set_git_dir
371
- - relative_path should honor dos-driver-prefix
372
- - test: use unambigous leading path (/foo) for mingw
342
+ (merged to 'next' on 2013-10-14 at 704b9ee)
343
+ + relative_path should honor dos-drive-prefix
344
+ + test: use unambigous leading path (/foo) for MSYS
345
346
Waiting for the review to settle.
347