What's cooking (2013/05 #03)
Junio C Hamano committed
May 9, 2013 at 14:33 UTC
e86ae7e419bbc1f866d41e8321f0969a7cb67d45
1 file changed
+111
-61
whats-cooking.txt
+111
-61
@@ -1,20 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2013, #02; Mon, 6)
4
-X-master-at: 423ecb0bb66e9d60b6667aebc2844e82205369a1
5
-X-next-at: cc59dccce3f551f6d04e123f8ba0564e5aee6c54
3
+Subject: What's cooking in git.git (May 2013, #03; Thu, 9)
4
+X-master-at: b387c77b12953d543bf5efc3825b5be26d753f9c
5
+X-next-at: 747d353d98dc660fb24ce70ad72ad9d9553c40ae
6
7
-What's cooking in git.git (May 2013, #02; Mon, 6)
7
+What's cooking in git.git (May 2013, #03; Thu, 9)
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
-As we already have merged enough changes to 'master' during this
15
-cycle that can potentially cause unforseen regressions, let's not
16
-merge topics that are not regression fixes from 'next' to 'master',
17
-either, until the final release.
14
+I'll tag 1.8.3-rc2 by the end of the week, and hopefully we can have
15
+a solid final release late next week. One embarrassing regression
16
+was found and had to be fixed today.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -24,56 +23,80 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
27
-* fc/remote-bzr (2013-04-30) 18 commits
28
- - remote-bzr: access branches only when needed
29
- - remote-bzr: delay peer branch usage
30
- - remote-bzr: iterate revisions properly
31
- - remote-bzr: improve progress reporting
32
- - remote-bzr: add option to specify branches
33
- - remote-bzr: add custom method to find branches
34
- - remote-bzr: improve author sanitazion
35
- - remote-bzr: add support for shared repo
36
- - remote-bzr: fix branch names
37
- - remote-bzr: add support for bzr repos
38
- - remote-bzr: use branch variable when appropriate
39
- - remote-bzr: fix partially pushed merge
40
- - remote-bzr: fixes for branch diverge
41
- - remote-bzr: add support to push merges
42
- - remote-bzr: always try to update the worktree
43
- - remote-bzr: fix order of locking in CustomTree
44
- - remote-bzr: delay blob fetching until the very end
45
- - remote-bzr: cleanup CustomTree
46
-
47
- To replace the one we pushed out in 1.8.2 after hearing that Emacs
48
- folks had a good experience with this version, this will be in
49
- 1.8.3-rc2.
26
+* fc/sha1-name-at-home (2013-05-07) 14 commits
27
+ - sha1_name: compare variable with constant, not constant with variable
28
+ - Add new @ shortcut for HEAD
29
+ - sha1_name: refactor reinterpret()
30
+ - sha1_name: check @{-N} errors sooner
31
+ - sha1_name: reorganize get_sha1_basic()
32
+ - sha1_name: don't waste cycles in the @-parsing loop
33
+ - sha1_name: remove unnecessary braces
34
+ - sha1_name: remove no-op
35
+ - tests: at-combinations: @{N} versus HEAD@{N}
36
+ - tests: at-combinations: increase coverage
37
+ - tests: at-combinations: improve nonsense()
38
+ - SQUASH??? style fixups
39
+ - tests: at-combinations: check ref names directly
40
+ - tests: at-combinations: simplify setup
41
42
--------------------------------------------------
43
[New Topics]
44
54
-* fc/fast-export-persistent-marks (2013-05-06) 3 commits
55
- - fast-export: don't parse commits while reading marks file
56
- - fast-export: do not parse non-commit objects while reading marks file
57
- - fast-{import,export}: use get_sha1_hex() directly
45
+* jh/shorten-refname (2013-05-07) 4 commits
46
+ - t1514: refname shortening is done after dereferencing symbolic refs
47
+ - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
48
+ - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
49
+ - t1514: Add tests of shortening refnames in strict/loose mode
50
59
- Seems to break a handful of topics when merged to the tip of 'pu'.
51
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
52
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
53
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
54
+ ref that points at remotes/origin/something, then it should show
55
+ "origin/something" and it already does).
56
57
62
-* jc/core-checkstat-2.0 (2013-05-06) 2 commits
63
- - core.statinfo: remove as promised in Git 2.0
64
- - deprecate core.statinfo at Git 2.0 boundary
58
+* nd/clone-local-with-colon (2013-05-07) 1 commit
59
+ - clone: allow cloning local paths with colons in them
60
66
- The bottom one is a fix for a breakage of a new feature in 1.8.2
67
- but it is not all that urgent.
61
+ "git clone foo/bar:baz" cannot be a request to clone from a remote
62
+ over git-over-ssh specified in the scp style. Detect this case and
63
+ clone from a local repository at "foo/bar:baz".
64
65
70
-* jk/packed-refs-race (2013-05-06) 4 commits
71
- - for_each_ref: load all loose refs before packed refs
72
- - get_packed_refs: reload packed-refs file when it changes
73
- - add a stat_validity struct
74
- - resolve_ref: close race condition for packed refs
66
+* nd/warn-ambiguous-object-name (2013-05-07) 1 commit
67
+ - get_sha1: improve ambiguity warning regarding SHA-1 and ref names
68
+
69
+ "git cmd <name>", when <name> happens to be a 40-hex string,
70
+ directly uses the 40-hex string as an object name, even if a ref
71
+ "refs/<some hierarchy>/<name>" exists. This disambiguation order
72
+ is unlikely to change, but we should warn about the ambiguity just
73
+ like we warn when more than one refs/ hierachies share the same
74
+ name.
75
+
76
+ The message needs to be fixed up, as this is not "refname is
77
+ ambiguous".
78
+
79
+
80
+* fc/zsh-leftover-bits (2013-05-08) 2 commits
81
+ - completion: synchronize zsh wrapper
82
+ - completion: cleanup zsh wrapper
83
+
84
+
85
+* rs/empty-archive (2013-05-09) 2 commits
86
+ - t5004: resurrect original empty tar archive test
87
+ - t5004: avoid using tar for checking emptiness of archive
88
+
89
+ Fixes tests added in 1.8.2 era that are broken on BSDs,
90
+ but it is not all that urgent.
91
92
93
+* vv/help-unknown-ref (2013-05-08) 2 commits
94
+ - merge: use help_unknown_ref()
95
+ - help: add help_unknown_ref()
96
+
97
+ Detect "git merge foo" that might have meant "git merge origin/foo"
98
+ and give an error message that is more specific than "foo is not
99
+ something we can merge".
100
101
--------------------------------------------------
102
[Stalled]
@@ -94,7 +117,8 @@ of the repositories listed at
117
* mh/multimail (2013-04-21) 1 commit
118
- git-multimail: a replacement for post-receive-email
119
97
- Waiting for comments.
120
+ Waiting for the initial history to pull from.
121
+ $gmane/223564
122
123
124
* jc/format-patch (2013-04-22) 2 commits
@@ -132,30 +156,58 @@ of the repositories listed at
156
157
158
* jn/config-ignore-inaccessible (2013-04-15) 1 commit
135
- - config: allow inaccessible configuration under $HOME
159
+ (merged to 'next' on 2013-05-07 at 4f09e24)
160
+ + config: allow inaccessible configuration under $HOME
161
162
When $HOME is misconfigured to point at an unreadable directory, we
163
used to complain and die. This loosens the check.
164
140
- I do not think we agreed that this is a good idea, though.
141
-
165
--------------------------------------------------
166
[Cooking]
167
145
-* fc/at-head (2013-05-02) 5 commits
168
+* fc/fast-export-persistent-marks (2013-05-07) 3 commits
169
+ - fast-{import,export}: use get_sha1_hex() to read from marks file
170
+ - fast-export: don't parse commits while reading marks file
171
+ - fast-export: do not parse non-commit objects while reading marks file
172
+
173
+ Optimization for fast-export by avoiding unnecessarily resolving
174
+ arbitrary object name and parsing object when only presence and
175
+ type information is necessary, etc.
176
+
177
+
178
+* jc/core-checkstat-2.0 (2013-05-06) 2 commits
179
+ - core.statinfo: remove as promised in Git 2.0
180
+ - deprecate core.statinfo at Git 2.0 boundary
181
+
182
+ The bottom one is a fix for a breakage of a new feature in 1.8.2
183
+ but it is not all that urgent.
184
+
185
+
186
+* jk/packed-refs-race (2013-05-06) 4 commits
187
+ - for_each_ref: load all loose refs before packed refs
188
+ - get_packed_refs: reload packed-refs file when it changes
189
+ - add a stat_validity struct
190
+ - resolve_ref: close race condition for packed refs
191
+
192
+
193
+* fc/at-head (2013-05-08) 13 commits
194
+ - sha1_name: compare variable with constant, not constant with variable
195
- Add new @ shortcut for HEAD
196
- sha1_name: refactor reinterpret()
148
- - sha1_name: compare variable with constant, not constant with variable
197
+ - sha1_name: check @{-N} errors sooner
198
+ - sha1_name: reorganize get_sha1_basic()
199
+ - sha1_name: don't waste cycles in the @-parsing loop
200
- sha1_name: remove unnecessary braces
201
- sha1_name: remove no-op
202
+ - tests: at-combinations: @{N} versus HEAD@{N}
203
+ - tests: at-combinations: increase coverage
204
+ - tests: at-combinations: improve nonsense()
205
+ - tests: at-combinations: check ref names directly
206
+ - tests: at-combinations: simplify setup
207
208
Instead of typing four capital letters "HEAD", you can say "@"
209
instead.
210
155
- There was another series from Ram that looked mostly test updates
156
- but I lost track of which one was which. In any case, are people
157
- happy with this series?
158
-
211
212
* jk/lookup-object-prefer-latest (2013-05-02) 1 commit
213
(merged to 'next' on 2013-05-06 at cc59dcc)
@@ -202,14 +254,12 @@ of the repositories listed at
254
Will cook in 'next'.
255
256
205
-* rj/mingw-cygwin (2013-04-28) 2 commits
257
+* rj/mingw-cygwin (2013-05-08) 2 commits
258
- cygwin: Remove the CYGWIN_V15_WIN32API build variable
259
- mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
260
209
- Cygwin portability; both were reviewed by Jonathan, and the tip one
210
- seems to want a bit further explanation. Needs positive report
211
- from Cygwin 1.7 users who have been on 1.7 to make sure it does not
212
- regress for them.
261
+ Update build for Cygwin 1.[57]. There seems to be an ongoing
262
+ discussion on the list.
263
264
265
* rj/sparse (2013-04-28) 10 commits