What's cooking (2008/11 #05)
Junio C Hamano committed
Nov 15, 2008 at 14:11 UTC
ba53e77bb93f7817d71e25ca539b5b5c0a2ee77b
1 file changed
+82
-87
whats-cooking.txt
+82
-87
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Nov 2008, #04; Wed, 12)
2
-X-master-at: 171d7661eda111d3e35f6e8097a1a3a07b30026c
3
-X-next-at: c990ab59beabbf7e62799d0a0190cc0a5171aba2
1
+Subject: What's cooking in git.git (Nov 2008, #05; Sat, 15)
2
+X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
3
+X-next-at: a277108ccd37bb47333edf23a681288943b48ef3
4
5
-What's cooking in git.git (Nov 2008, #04; Wed, 12)
5
+What's cooking in git.git (Nov 2008, #05; Sat, 15)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -12,39 +12,43 @@ in 'next'.
12
The topics list the commits in reverse chronological order. The topics
13
meant to be merged to the maintenance series have "maint-" in their names.
14
15
-I think we should declare -rc0 by the end of this week, with the goal of
16
-including everything that are in 'next' as of tonight, plus the "narrow
17
-checkout" and possibly Pierre's send-email that acts as format-patch
18
-frontend, by the time we hit -rc1, perhaps soon after the end of month.
19
-
15
----------------------------------------------------------------
16
[New Topics]
17
18
+* lt/preload-lstat (Thu Nov 13 16:36:30 2008 -0800) 1 commit
19
+ - Add cache preload facility
20
+
21
+* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
22
+ - [DONTMERGE] Add -k/--keep-going option to mergetool
23
+ - Add -y/--no-prompt option to mergetool
24
+ - Fix some tab/space inconsistencies in git-mergetool.sh
25
+
26
+Jeff had good comments on the last one; the discussion needs concluded,
27
+and also waiting for comments from the original author (Ted).
28
+
29
+* ta/quiet-pull (Sat Nov 15 01:14:24 2008 +0100) 1 commit
30
+ - Teach/Fix pull/fetch -q/-v options
31
+
32
+This has my fixes to preserve "fetch -v -v" behaviour squashed in.
33
+
34
+----------------------------------------------------------------
35
+[Graduated to "master"]
36
+
37
* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit
38
+ git push: Interpret $GIT_DIR/branches in a Cogito compatible way
39
26
-* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 5 commits
27
- + status: show "-v" diff even for initial commit
28
- + Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
29
- + commit: Fix stripping of patch in verbose mode.
30
- + wt-status: refactor initial commit printing
31
- + define empty tree sha1 as a macro
40
+Will need to further downmerge to 'maint'.
41
42
* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit
43
+ commit: Fix stripping of patch in verbose mode.
44
36
-* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
37
- - git send-email: ask less questions when --compose is used.
38
- - git send-email: add --annotate option
39
- - git send-email: interpret unknown files as revision lists
40
- - git send-email: make the message file name more specific.
45
+Will need to further downmerge to 'maint'.
46
42
-* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
43
- - diffcore-rename: add config option to allow to cache renames
44
- - diffcore-rename: support rename cache
47
+* st/maint-tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
48
+ + tag: Add more tests about mixing incompatible modes and options
49
+ + tag: Check that options are only allowed in the appropriate mode
50
46
-----------------------------------------------------------------
47
-[Will merge to "master" soon]
51
+Will need to further downmerge to 'maint'.
52
53
* jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits
54
+ receive-pack: detect push to current branch of non-bare repo
@@ -71,28 +75,9 @@ This performance fix may eventually need to be cherry-picked to 'maint'.
75
+ gitweb: retrieve snapshot format from PATH_INFO
76
+ gitweb: make the supported snapshot formats array global
77
74
-Got sick of waiting for re-Ack.
75
-
78
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
79
+ gitweb: Better processing format string in custom links in navbar
80
79
-Got sick of waiting for some sort of response from Pasky.
80
-
81
-* st/tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
82
- + tag: Add more tests about mixing incompatible modes and options
83
- + tag: Check that options are only allowed in the appropriate mode
84
-
85
-* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 5 commits
86
- - autoconf: Enable threaded delta search when pthreads are supported
87
- + Add autoconf tests for pthreads
88
- + Make Pthread link flags configurable
89
- + Add Makefile check for FreeBSD 4.9-SECURITY
90
- + Build: add NO_UINTMAX_T to support ancient systems
91
-
92
-I split the part that unconditionally enable threaded delta search on any
93
-platform on which Pthread library is detected to be available from the
94
-topmost one. Will merge the rest to 'master' soon.
95
-
81
* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
82
+ enable textconv for diff in verbose status/commit
83
+ wt-status: load diff ui config
@@ -103,36 +88,11 @@ topmost one. Will merge the rest to 'master' soon.
88
+ document the diff driver textconv feature
89
+ diff: add missing static declaration
90
106
-* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 4 commits
91
+* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 1 commit
92
+ Avoid using non-portable `echo -n` in tests.
108
- + add userdiff textconv tests
109
- + document the diff driver textconv feature
110
- + diff: add missing static declaration
93
94
An update to the one above.
95
114
-----------------------------------------------------------------
115
-[Actively Cooking]
116
-
117
-* bc/maint-keep-pack (Sun Nov 9 23:59:58 2008 -0600) 9 commits
118
- + pack-objects: extend --local to mean ignore non-local loose
119
- objects too
120
- + sha1_file.c: split has_loose_object() into local and non-local
121
- counterparts
122
- + t7700: demonstrate mishandling of loose objects in an alternate
123
- ODB
124
- + builtin-gc.c: use new pack_keep bitfield to detect .keep file
125
- existence
126
- + repack: do not fall back to incremental repacking with [-a|-A]
127
- + repack: don't repack local objects in packs with .keep file
128
- + pack-objects: new option --honor-pack-keep
129
- + packed_git: convert pack_local flag into a bitfield and add
130
- pack_keep
131
- + t7700: demonstrate mishandling of objects in packs with a .keep
132
- file
133
-
134
-A few commits were rewound from 'next' and replaced with new ones.
135
-
96
* np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits
97
+ t5303: fix printf format string for portability
98
+ t5303: work around printf breakage in dash
@@ -156,27 +116,62 @@ A few commits were rewound from 'next' and replaced with new ones.
116
+ remote: add a new 'origin' variable to the struct
117
+ Implement git remote rename
118
159
-* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
160
- + blame: show "previous" information in --porcelain/--incremental
161
- format
162
- + git-blame: refactor code to emit "porcelain format" output
119
+----------------------------------------------------------------
120
+[Will merge to "master" soon]
121
+
122
+* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
123
+ + repack: only unpack-unreachable if we are deleting redundant packs
124
+
125
+This makes "repack -A -d" without -d do the same thing as "repack -a -d",
126
+which makes sense. This does not have to go to 'maint', though.
127
+
128
+* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits
129
+ + status: show "-v" diff even for initial commit
130
+ + Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
131
+ + wt-status: refactor initial commit printing
132
+ + define empty tree sha1 as a macro
133
+
134
+----------------------------------------------------------------
135
+[Actively Cooking]
136
137
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
165
- - grep: skip files outside sparse checkout area
166
- - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
167
- - Prevent diff machinery from examining worktree outside sparse
138
+ + grep: skip files outside sparse checkout area
139
+ + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
140
+ + Prevent diff machinery from examining worktree outside sparse
141
checkout
169
- - ls-files: Add tests for --sparse and friends
170
- - update-index: add --checkout/--no-checkout to update
142
+ + ls-files: Add tests for --sparse and friends
143
+ + update-index: add --checkout/--no-checkout to update
144
CE_NO_CHECKOUT bit
172
- - update-index: refactor mark_valid() in preparation for new options
173
- - ls-files: add options to support sparse checkout
174
- - Introduce CE_NO_CHECKOUT bit
175
- - Extend index to save more flags
176
-
177
-Early parts looked Ok; I am trying to find time to review the whole thing
178
-but fixing bugs in topics from other people here and there took almost all
179
-my time this weekend. Not good.
145
+ + update-index: refactor mark_valid() in preparation for new options
146
+ + ls-files: add options to support sparse checkout
147
+ + Introduce CE_NO_CHECKOUT bit
148
+ + Extend index to save more flags
149
+
150
+I think the basic idea and structure of this is sound. Let's see if
151
+people who try this feature can find holes in what it currently does.
152
+
153
+* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
154
+ - autoconf: Enable threaded delta search when pthreads are supported
155
+
156
+* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
157
+ - git send-email: ask less questions when --compose is used.
158
+ - git send-email: add --annotate option
159
+ - git send-email: interpret unknown files as revision lists
160
+ - git send-email: make the message file name more specific.
161
+
162
+* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
163
+ - diffcore-rename: add config option to allow to cache renames
164
+ - diffcore-rename: support rename cache
165
+
166
+I am moderately negative on this one in its current shape. We shouldn't
167
+have to be storing what can be recomputed (and recomputed differently in
168
+later software), and we shouldn't be keeping such cached result
169
+indefinitely.
170
+
171
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
172
+ + blame: show "previous" information in --porcelain/--incremental
173
+ format
174
+ + git-blame: refactor code to emit "porcelain format" output
175
176
----------------------------------------------------------------
177
[On Hold]