What's cooking (2012/03 #10)
Junio C Hamano committed
Mar 28, 2012 at 15:21 UTC
05cbd61b0d3f59295c811f95da23e6e43d7eff92
1 file changed
+58
-31
whats-cooking.txt
+58
-31
@@ -1,15 +1,17 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2012, #09; Mon, 26)
3
-X-master-at: fae9d761c78cba1039854b51df6c2f7360e59cba
4
-X-next-at: 74cd462aafcd177c1507741065d5836c6f8424aa
2
+Subject: What's cooking in git.git (Mar 2012, #10; Wed, 28)
3
+X-master-at: 455cf268dbaf227bdbd5e9fbf96525452bcfe44f
4
+X-next-at: 59406684b6bbd073b171b4f8f3bc5b33966f3187
5
6
-What's cooking in git.git (Mar 2012, #09; Mon, 26)
6
+What's cooking in git.git (Mar 2012, #10; Wed, 28)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-The updates for "gitk" part is now ready for 1.7.10.
12
+Hopefully the release will be done early next week. The final rc was
13
+tagged and pushed out today so that people can play with it and report
14
+possible issues.
15
16
You can find the changes described here in the integration branches of the
17
repositories listed at
@@ -19,18 +21,36 @@ repositories listed at
21
--------------------------------------------------
22
[New Topics]
23
22
-* rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit
23
- - combine-diff: fix loop index underflow
24
+* dg/subtree (2012-03-25) 112 commits
25
+ - Add 'contrib/subtree/' from commit '2e63f75b8f49abe220ef55ec4e978e7a3b8dc351'
26
+ - Add Subtree Test Makefile
27
+ - Build Subtree
28
+ - Use Project Config Files
29
+ - Remove Unneeded Files
30
+ - ...
31
25
-Fixes an age old corner case bug in combine diff (only triggered with -U0
26
-and the hunk at the beginning of the file needs to be shown).
32
+A test merge of the 'subtree'.
33
28
-* sl/autoconf (2012-03-26) 3 commits
29
- - configure: be more idiomatic
30
- - configure: avoid some code repetitions thanks to m4_{push,pop}def
31
- - configure: move definitions of private m4 macros before AC_INIT invocation
34
+* jk/branch-quiet (2012-03-26) 2 commits
35
+ - teach "git branch" a --quiet option
36
+ - checkout: suppress tracking message with "-q"
37
33
-Updates our configure.ac to follow a better "autoconf" style.
38
+Even with "-q"uiet option, "checkout" used to report setting up tracking.
39
+Also "branch" learns "-q"uiet option to squelch informational message.
40
+
41
+* jk/run-command-eacces (2012-03-27) 3 commits
42
+ - [DONTMERGE] semi-squashable test addition
43
+ - git: continue alias lookup on EACCES errors
44
+ - run-command: propagate EACCES errors to parent
45
+
46
+When PATH contains an unreadable directory, alias expansion code did not
47
+kick in, and failed with an error that said "git-subcmd" was not found.
48
+
49
+* jb/am-include (2012-03-28) 1 commit
50
+ - am: support --include option
51
+
52
+* jc/am-report-3way (2012-03-28) 1 commit
53
+ - am -3: list the paths that needed 3-way fallback
54
55
--------------------------------------------------
56
[Stalled]
@@ -86,31 +106,19 @@ Another reroll after a bugreport on pthread usage discovered by Ramsey,
106
but it seems the topic is cooking between Ramsay and Duy out of tree.
107
Waiting for resolution.
108
89
-* jh/apply-free-patch (2012-03-21) 4 commits
109
+* jh/apply-free-patch (2012-03-27) 6 commits
110
- apply.c: WIP ownership audit
111
- apply: free patch->result
112
+ - apply: release memory for fn_table
113
- apply: free patch->{def,old,new}_name fields
114
+ - apply: rename free_patch() to free_patch_list()
115
- apply: do not leak patches and fragments
116
95
-Valgrind reports quite a lot of discarded memory inside apply. I have a
96
-slight suspicion that we should first clarify the ownership rules of
97
-pieces of memory in this standalone program that was designed to be "run
98
-once and let exit take care of the memory" before proceeding further.
117
+Valgrind reports quite a lot of discarded memory inside apply. I started
118
+auditing the memory ownership rules in the command, and am almost done.
119
120
Will defer til 1.7.10.
121
102
-* dg/test-from-elsewhere (2012-03-04) 2 commits
103
- - Support out-of-tree Valgrind tests
104
- - Allow overriding GIT_BUILD_DIR
105
-
106
-Better support for out-of-tree test scripts, but it appears that the
107
-approach needs to be rethought. By repointing TEST_DIRECTORY to a
108
-directory other than $(pwd)/.., an out of place test script can reach
109
-test helpers and freshly built Git relative to it (GIT_BUILD_DIR is
110
-a mere short-hand for $TEST_DIRECTORY/..).
111
-
112
-Discussion stalled.
113
-
122
* hv/submodule-recurse-push (2012-02-13) 3 commits
123
- push: teach --recurse-submodules the on-demand option
124
- Refactor submodule push check to use string list instead of integer
@@ -161,6 +169,19 @@ not working :-(.
169
--------------------------------------------------
170
[Cooking]
171
172
+* rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit
173
+ - combine-diff: fix loop index underflow
174
+
175
+Fixes an age old corner case bug in combine diff (only triggered with -U0
176
+and the hunk at the beginning of the file needs to be shown).
177
+
178
+* sl/autoconf (2012-03-26) 3 commits
179
+ - configure: be more idiomatic
180
+ - configure: avoid some code repetitions thanks to m4_{push,pop}def
181
+ - configure: move definitions of private m4 macros before AC_INIT invocation
182
+
183
+Updates our configure.ac to follow a better "autoconf" style.
184
+
185
* wk/gitweb-snapshot-use-if-modified-since (2012-03-26) 3 commits
186
- gitweb: add If-Modified-Since handling to git_snapshot().
187
- gitweb: refactor If-Modified-Since handling
@@ -379,3 +400,9 @@ Will defer til 1.7.10.
400
+ t0204: remove a test that checks undefined behaviour
401
402
I tentatively parked this in 'next' but later reverted the merge.
403
+
404
+* dg/test-from-elsewhere (2012-03-04) 2 commits
405
+ . Support out-of-tree Valgrind tests
406
+ . Allow overriding GIT_BUILD_DIR
407
+
408
+No immediate need; dropped.