What's cooking (2013/08 #05)
Junio C Hamano committed
Aug 19, 2013 at 14:34 UTC
ec9b2631d3b5006eb3c925822bfd7002cbbbfde4
1 file changed
+57
-37
whats-cooking.txt
+57
-37
@@ -1,59 +1,65 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2013, #04; Thu, 15)
4
-X-master-at: 2c2b6646c2723459dbd334c7ced6f77ffb0d596e
5
-X-next-at: c3113b0f8e8c144de8253871ce8abb30e7d58465
3
+Subject: What's cooking in git.git (Aug 2013, #05; Mon, 19)
4
+X-master-at: 4d06473928ee574910accbde05c19ef2263abdf6
5
+X-next-at: fb33910d190a5cff4020f44651fc3a51f55c0a1f
6
7
-What's cooking in git.git (Aug 2013, #04; Thu, 15)
7
+What's cooking in git.git (Aug 2013, #05; Mon, 19)
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
-Unfortunately, due to regression two topics were reverted but
15
-without prejudice (i.e. these reverts do not mean what these topics
16
-tried to achieve have been rejected---they just need to be redone
17
-without introducing the regression):
14
+An extra release candidate -rc4 has been tagged and pushed out.
15
+Hopefully this will be the last one before the final release of
16
+1.8.4. As I expect we will have two more cycles of 1.8.x by the end
17
+of the year and then 2.0 early next year, we may want to merge these
18
+"for 2.0" topics to 'next' for real, starting the next cycle.
19
19
- * An attempted fix to "git stash save", to detect that going back
20
- to the state of the HEAD needs to lose killed files, and/or
21
- untracked files in a killed directory, to prevent the command
22
- from proceeding without "--force".
20
+You can find the changes described here in the integration branches
21
+of the repositories listed at
22
24
- This used "ls-files -k" that was unusably slow.
23
+ http://git-blame.blogspot.com/p/git-public-repositories.html
24
26
- * An attempted enhancement to allow "@" to be used to name "HEAD".
25
+--------------------------------------------------
26
+[New Topics]
27
28
- This rewrote "@" in a ref where it shouldn't have,
29
- e.g. refs/@/foo.
28
+* es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit
29
+ - rebase -i: fix cases ignoring core.commentchar
30
31
-The schedule for 1.8.4 has been updated to have an extra rc this
32
-weekend (1.8.4-rc4) in order to make sure these reverts do not have
33
-unexpected fallout, even though I do not anticipate any. The final
34
-has to be delayed by a week, and the current plan is to tag it on
35
-Aug 23rd (see http://tinyurl.com/gitCal).
31
+ Will merge to and cook in 'next'.
32
37
-A new topic to optimize "ls-files -k" has been posted, and it may
38
-help resurrect the "git stash save" topic after 1.8.4 release.
33
40
-You can find the changes described here in the integration branches
41
-of the repositories listed at
34
+* jx/branch-vv-always-compare-with-upstream (2013-08-18) 3 commits
35
+ - status: always show tracking branch even no change
36
+ - branch: mark missing tracking branch as gone
37
+ - branch: not report invalid tracking branch
38
43
- http://git-blame.blogspot.com/p/git-public-repositories.html
39
45
---------------------------------------------------
46
-[New Topics]
40
+* nd/fetch-into-shallow (2013-08-18) 6 commits
41
+ - list-objects: mark more commits as edges in mark_edges_uninteresting
42
+ - list-objects: reduce one argument in mark_edges_uninteresting
43
+ - upload-pack: delegate rev walking in shallow fetch to pack-objects
44
+ - shallow: add setup_temporary_shallow()
45
+ - shallow: only add shallow graft points to new shallow file
46
+ - move setup_alternate_shallow and write_shallow_commits to shallow.c
47
48
-* jc/ls-files-killed-optim (2013-08-15) 3 commits
49
- - t3010: update to demonstrate "ls-files -k" optimization pitfalls
50
- - ls-files -k: a directory only can be killed if the index has a non-directory
51
- - dir.c: use the cache_* macro to access the current index
48
53
- "git ls-files -k" needs to crawl only the part of the working tree
54
- that may overlap the paths in the index to find killed files, but
55
- shared code with the logic to find all the untracked files, which
56
- made it unnecessarily inefficient.
49
+* sb/diff-delta-remove-needless-comparison (2013-08-18) 1 commit
50
+ - create_delta_index: simplify condition always evaluating to true
51
+
52
+ Will merge to and cook in 'next'.
53
+
54
+
55
+* sg/bash-prompt-lf-in-cwd-test (2013-08-18) 1 commit
56
+ - bash prompt: test the prompt with newline in repository path
57
+
58
+ Will merge to and cook in 'next'.
59
+
60
+
61
+* jl/some-submodule-config-are-not-boolean (2013-08-19) 1 commit
62
+ - avoid segfault on submodule.*.path set to an empty "true"
63
64
Will merge to and cook in 'next'.
65
@@ -165,6 +171,19 @@ of the repositories listed at
171
--------------------------------------------------
172
[Cooking]
173
174
+* jc/ls-files-killed-optim (2013-08-15) 3 commits
175
+ - t3010: update to demonstrate "ls-files -k" optimization pitfalls
176
+ - ls-files -k: a directory only can be killed if the index has a non-directory
177
+ - dir.c: use the cache_* macro to access the current index
178
+
179
+ "git ls-files -k" needs to crawl only the part of the working tree
180
+ that may overlap the paths in the index to find killed files, but
181
+ shared code with the logic to find all the untracked files, which
182
+ made it unnecessarily inefficient.
183
+
184
+ Will merge to and cook in 'next'.
185
+
186
+
187
* es/blame-L-twice (2013-08-06) 16 commits
188
(merged to 'next' on 2013-08-08 at 9d6f821)
189
+ line-range: reject -L line numbers less than 1
@@ -217,7 +236,8 @@ of the repositories listed at
236
Will cook in 'next'.
237
238
220
-* es/rebase-i-no-abbrev (2013-08-11) 3 commits
239
+* es/rebase-i-no-abbrev (2013-08-18) 4 commits
240
+ - rebase -i: fix core.commentchar regression
241
(merged to 'next' on 2013-08-14 at d449e0e)
242
+ rebase: interactive: fix short SHA-1 collision
243
+ t3404: rebase: interactive: demonstrate short SHA-1 collision