What's cooking (2008/12 #03)
Junio C Hamano committed
Dec 21, 2008 at 04:16 UTC
a393874c6fa71e945df7a5000897f84b3c2c4786
1 file changed
+75
-35
whats-cooking.txt
+75
-35
@@ -1,26 +1,58 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2008, #02; Sun, 14)
3
-bcc: William Pursell <bill.pursell@gmail.com>, Theodore Tso <tytso@mit.edu>
4
-X-master-at: 7e76aba317b690932c8236311219b0faf97f1571
5
-X-next-at: eb2f0c452e2cf87efa16cc9ace8587e198d60eb0
6
-
7
-What's cooking in git.git (Dec 2008, #02; Sun, 14)
2
+cc: Johannes Sixt <j6t@kdbg.org>,
3
+ Johannes Schindelin <Johannes.Schindelin@gmx.de>,
4
+ "Simon Schubert" <corecode@fs.ei.tum.de>
5
+Subject: What's cooking in git.git (Dec 2008, #03; Sun, 21)
6
+X-master-at: b3eae84dc10e452add0e79c7373ceee16f73f7f0
7
+X-next-at: 43db18a982c1bdb5d2c1849c429ae3a456b8a51e
8
+
9
+What's cooking in git.git (Dec 2008, #03; Sun, 21)
10
--------------------------------------------------
11
12
Here are the topics that have been cooking. Commits prefixed
13
with '-' are only in 'pu' while commits prefixed with '+' are
12
-in 'next'.
14
+in 'next'. The ones marked with '.' do not appear in any of the branches,
15
+but I am still holding onto them.
16
17
The topics list the commits in reverse chronological order. The topics
18
meant to be merged to the maintenance series have "maint-" in their names.
19
17
-As we have already passed -rc2, things queued in 'next' let alone 'pu' are
20
+As we have already passed -rc3, things queued in 'next' let alone 'pu' are
21
unlikely to be merged to 'master' by the end of year unless otherwise
22
noted.
23
24
----------------------------------------------------------------
25
[New Topics]
26
27
+* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit
28
+ - gitweb: unify boolean feature subroutines
29
+
30
+* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits
31
+ - Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-
32
+ recursive-fix
33
+ - merge-recursive: do not clobber untracked working tree garbage
34
+ - modify/delete conflict resolution overwrites untracked file
35
+
36
+* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits
37
+ - merge-recursive: do not clobber untracked working tree garbage
38
+ - modify/delete conflict resolution overwrites untracked file
39
+
40
+* js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits
41
+ - Add an expensive test for git-notes
42
+ - Speed up git notes lookup
43
+ - Add a script to edit/inspect notes
44
+ - Introduce commit notes
45
+
46
+* js/rebase-i-p (Mon Dec 15 11:05:31 2008 +0100) 2 commits
47
+ - rebase -i -p: Fix --continue after a merge could not be redone
48
+ - Show a failure of rebase -p if the merge had a conflict
49
+
50
+I am undecided whether I should include these in 1.6.1 and have been
51
+waiting for comments from Dscho.
52
+
53
+----------------------------------------------------------------
54
+[Post 1.6.1 items]
55
+
56
* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
57
+ Add 'g' command to go to a hunk
58
+ Add subroutine to display one-line summary of hunks
@@ -37,9 +69,10 @@ of this series and it looked promising.
69
- Add support for a pdf version of the user manual
70
71
I do not have a new enough combination of dblatex and asciidoc myself but
40
-this would help interested people.
72
+this may help interested people.
73
42
-* np/auto-thread (Sat Dec 13 15:06:40 2008 -0500) 2 commits
74
+* np/auto-thread (Mon Dec 15 20:44:30 2008 +0100) 3 commits
75
+ + Force t5302 to use a single thread
76
+ pack-objects: don't use too many threads with few objects
77
+ autodetect number of CPUs by default when using threads
78
@@ -48,22 +81,18 @@ this would help interested people.
81
- gitweb: Split git_project_list_body in two functions
82
- gitweb: Modularized git_get_project_description to be more generic
83
51
-----------------------------------------------------------------
52
-[Post 1.6.1 items]
53
-
54
-* gb/gitweb-patch (Sat Dec 6 16:02:35 2008 +0100) 3 commits
55
- - gitweb: link to patch(es) view from commit and log views
84
+* gb/gitweb-patch (Thu Dec 18 08:13:19 2008 +0100) 4 commits
85
+ - gitweb: link to patch(es) view in commit(diff) and (short)log view
86
- gitweb: add patches view
87
+ - gitweb: change call pattern for git_commitdiff
88
- gitweb: add patch view
89
59
-Updated series. Reviews and Acks?
90
+Updated series.
91
92
* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits
93
+ Document "git-reset --merge"
94
+ Add 'merge' mode to 'git reset'
95
65
-With updated documents.
66
-
96
* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
97
. In add --patch, Handle K,k,J,j slightly more gracefully.
98
. Add / command in add --patch
@@ -85,23 +114,7 @@ other interested parties.
114
----------------------------------------------------------------
115
[Graduated to "master"]
116
88
-* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
89
- + git add --intent-to-add: do not let an empty blob be committed by
90
- accident
91
- + git add --intent-to-add: fix removal of cached emptiness
92
- + builtin-rm.c: explain and clarify the "local change" logic
93
- + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
94
- + Extend index to save more flags
95
-
96
-As intent-to-add index entry is a new feature for 1.6.1, it probably is a
97
-good idea to merge this to 'master'. Nitpicks and bugfixes are very much
98
-appreciated.
99
-
100
-* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
101
- + gitweb: Fix handling of non-ASCII characters in inserted HTML
102
- files.
103
-
104
-A bugfix.
117
+Nothing cooking was "not so trivial but want to have in final".
118
119
----------------------------------------------------------------
120
[Will merge to "master" soon]
@@ -111,6 +124,14 @@ What are you looking for? We are in -rc ;-)
124
----------------------------------------------------------------
125
[On Hold]
126
127
+* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
128
+ . git-am: Pass the --directory option through to git-apply
129
+
130
+A reroll of this by Simon Schubert triggered a series to fix a parameter
131
+propagation bug, and another reroll to add "git am --directory=path/"
132
+should be much easier now. I am not likely to use the feature myself, so
133
+it is up to intrested volunteers to carry it forward.
134
+
135
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
136
+ blame: show "previous" information in --porcelain/--incremental
137
format
@@ -221,3 +242,22 @@ this back for now.
242
- stripspace: use parse_options()
243
- Add "git am -s" test
244
- git-am: refactor code to add signed-off-by line for the committer
245
+
246
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
247
+ . revision --simplify-merges: incremental simplification
248
+ . revision --simplify-merges: prepare for incremental simplification
249
+
250
+* jc/clone-symref (Sat Nov 29 23:38:21 2008 -0800) 6 commits
251
+ . clone: test the new HEAD detection logic
252
+ . Merge sender side of "symbolic-ref" protocol extension
253
+ . upload-pack: implement protocol extension "symbolic-ref"
254
+ . clone: find the current branch more explicitly
255
+ . get_remote_heads(): do not assume that the operation is one-way
256
+ . upload-pack.c: refactor receive_needs()
257
+
258
+* jk/valgrind (Thu Oct 23 04:30:45 2008 +0000) 2 commits
259
+ . valgrind: ignore ldso errors
260
+ . add valgrind support in test scripts
261
+
262
+* jc/apply (Sun Sep 7 14:36:24 2008 -0700) 1 commit
263
+ . WIP