What's cooking (2013/05 #02)
Junio C Hamano committed
May 6, 2013 at 23:56 UTC
ab3ff1d141d08cdcc1edabcde07406c79e2c68c4
1 file changed
+75
-66
whats-cooking.txt
+75
-66
@@ -1,23 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2013, #01; Fri, 3)
4
-X-master-at: 7d3ccdffb5d28970dd7a4d177cfcca690ccd0c22
5
-X-next-at: 3fadc6125b27e103d8f0ce6c19c749a972da4d25
3
+Subject: What's cooking in git.git (May 2013, #02; Mon, 6)
4
+X-master-at: 423ecb0bb66e9d60b6667aebc2844e82205369a1
5
+X-next-at: cc59dccce3f551f6d04e123f8ba0564e5aee6c54
6
7
-What's cooking in git.git (May 2013, #01; Fri, 3)
7
+What's cooking in git.git (May 2013, #02; Mon, 6)
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 tip of the 'master' branch is tagged as v1.8.3-rc1. We seem to
15
-have a few interesting topics that are being discussed but it is
16
-unlikely I'll be picking them up in 'pu'. As we already have merged
17
-enough changes to 'master' during this cycle that can potentially
18
-cause unforseen regressions, let's not merge topics that are not
19
-regression fixes from 'next' to 'master', either, until the final
20
-release.
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.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -27,53 +24,6 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
30
-* hb/git-pm-tempfile (2013-04-29) 1 commit
31
- (merged to 'next' on 2013-04-29 at fecc6b0)
32
- + Git.pm: call tempfile from File::Temp as a regular function
33
-
34
-
35
-* mb/relnotes-1.8.3-typofix (2013-04-30) 1 commit
36
- - Fix grammar in the 1.8.3 release notes.
37
-
38
-
39
-* rs/pp-user-info-without-extra-allocation (2013-04-25) 3 commits
40
- (merged to 'next' on 2013-04-29 at 13eafc3)
41
- + pretty: remove intermediate strbufs from pp_user_info()
42
- + pretty: simplify output line length calculation in pp_user_info()
43
- + pretty: simplify input line length calculation in pp_user_info()
44
-
45
-
46
-* tr/remote-tighten-commandline-parsing (2013-04-24) 3 commits
47
- (merged to 'next' on 2013-04-29 at 46a1043)
48
- + remote: 'show' and 'prune' can take more than one remote
49
- + remote: check for superfluous arguments in 'git remote add'
50
- + remote: add a test for extra arguments, according to docs
51
-
52
-
53
-* tr/unpack-entry-use-after-free-fix (2013-04-30) 1 commit
54
- - unpack_entry: avoid freeing objects in base cache
55
-
56
- Fix for use-after-free regression in 1.8.3-rc0.
57
-
58
-
59
-* zk/prompt-rebase-step (2013-04-25) 1 commit
60
- (merged to 'next' on 2013-04-25 at a8264bf)
61
- + bash-prompt.sh: show where rebase is at when stopped
62
-
63
---------------------------------------------------
64
-[New Topics]
65
-
66
-* fc/at-head (2013-05-02) 5 commits
67
- - Add new @ shortcut for HEAD
68
- - sha1_name: refactor reinterpret()
69
- - sha1_name: compare variable with constant, not constant with variable
70
- - sha1_name: remove unnecessary braces
71
- - sha1_name: remove no-op
72
-
73
- People are too lazy to type four capital letters "HEAD" and want to
74
- use a single line-noise "@" instead.
75
-
76
-
27
* fc/remote-bzr (2013-04-30) 18 commits
28
- remote-bzr: access branches only when needed
29
- remote-bzr: delay peer branch usage
@@ -94,13 +44,36 @@ of the repositories listed at
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.
50
98
-* jk/lookup-object-prefer-latest (2013-05-02) 1 commit
99
- - lookup_object: prioritize recently found objects
51
+--------------------------------------------------
52
+[New Topics]
53
+
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
58
+
59
+ Seems to break a handful of topics when merged to the tip of 'pu'.
60
+
61
+
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
65
+
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.
68
+
69
+
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
75
76
102
-* jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit
103
- - contrib/subtree: don't delete remote branches if split fails
77
78
--------------------------------------------------
79
[Stalled]
@@ -169,6 +142,37 @@ of the repositories listed at
142
--------------------------------------------------
143
[Cooking]
144
145
+* fc/at-head (2013-05-02) 5 commits
146
+ - Add new @ shortcut for HEAD
147
+ - sha1_name: refactor reinterpret()
148
+ - sha1_name: compare variable with constant, not constant with variable
149
+ - sha1_name: remove unnecessary braces
150
+ - sha1_name: remove no-op
151
+
152
+ Instead of typing four capital letters "HEAD", you can say "@"
153
+ instead.
154
+
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
+
159
+
160
+* jk/lookup-object-prefer-latest (2013-05-02) 1 commit
161
+ (merged to 'next' on 2013-05-06 at cc59dcc)
162
+ + lookup_object: prioritize recently found objects
163
+
164
+ Optimizes object lookup when the object hashtable starts to become
165
+ crowded.
166
+
167
+
168
+* jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit
169
+ (merged to 'next' on 2013-05-06 at 81bdf37)
170
+ + contrib/subtree: don't delete remote branches if split fails
171
+
172
+ "git subtree" (in contrib/) had one codepath with loose error
173
+ checks to lose data at the remote side.
174
+
175
+
176
* fc/completion (2013-04-27) 9 commits
177
- completion: remove __git_index_file_list_filter()
178
- completion: add space after completed filename
@@ -184,7 +188,9 @@ of the repositories listed at
188
version? This is its v2, in the $gmane/222682 thread.
189
190
187
-* jk/test-output (2013-04-29) 2 commits
191
+* jk/test-output (2013-05-06) 3 commits
192
+ (merged to 'next' on 2013-05-06 at 7c03af3)
193
+ + t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
194
(merged to 'next' on 2013-05-01 at 63827c9)
195
+ test output: respect $TEST_OUTPUT_DIRECTORY
196
+ t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
@@ -242,20 +248,23 @@ of the repositories listed at
248
Will cook in 'next'.
249
250
245
-* kb/full-history-compute-treesame-carefully (2013-04-30) 8 commits
246
- - revision.c: discount UNINTERESTING parents
251
+* kb/full-history-compute-treesame-carefully (2013-05-06) 11 commits
252
+ - revision.c: treat A...B merge bases as if manually specified
253
+ - revision.c: discount side branches when computing TREESAME
254
- simplify-merges: drop merge from irrelevant side branch
255
- simplify-merges: never remove all TREESAME parents
256
- t6012: update test for tweaked full-history traversal
257
- revision.c: Make --full-history consider more merges
258
- rev-list-options.txt: correct TREESAME for P
259
+ - t6111: allow checking the parents as well
260
+ - t6111: new TREESAME test set
261
- t6019: test file dropped in -s ours merge
262
- decorate.c: compact table when growing
263
264
Major update to a very core part of the system to improve culling
265
of irrelevant parents while traversing a mergy history.
266
258
- Will not be a 1.8.3 material.
267
+ Will not be a 1.8.3 material, but is an important topic.
268
269
270
* jh/checkout-auto-tracking (2013-04-21) 8 commits