What's cooking (2008/11 #06)
Junio C Hamano committed
Dec 2, 2008 at 22:55 UTC
2f8d35af0045e71a7baf85f8cca349dae4b82dde
1 file changed
+125
-117
whats-cooking.txt
+125
-117
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Nov 2008, #05; Sat, 15)
2
-X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
3
-X-next-at: a277108ccd37bb47333edf23a681288943b48ef3
1
+Subject: What's cooking in git.git (Nov 2008, #06; Wed, 26)
2
+X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
3
+X-next-at: 406979f7fe53d139cdb79bf8c5eecf8735f4f146
4
5
-What's cooking in git.git (Nov 2008, #05; Sat, 15)
5
+What's cooking in git.git (Nov 2008, #06; Wed, 26)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -15,109 +15,99 @@ meant to be merged to the maintenance series have "maint-" in their names.
15
----------------------------------------------------------------
16
[New Topics]
17
18
-* lt/preload-lstat (Thu Nov 13 16:36:30 2008 -0800) 1 commit
19
- - Add cache preload facility
18
+* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
19
+ + git-remote: add verbose mode to git remote update
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
21
+Should be in 1.6.1-rc1.
22
26
-Jeff had good comments on the last one; the discussion needs concluded,
27
-and also waiting for comments from the original author (Ted).
23
+* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
24
+ + remove the unused files interpolate.c and interpolate.h
25
+ + daemon: deglobalize variable 'directory'
26
+ + daemon: inline fill_in_extra_table_entries()
27
+ + daemon: use strbuf_expand() instead of interpolate()
28
+ + merge-recursive: use strbuf_expand() instead of interpolate()
29
+ + add strbuf_expand_dict_cb(), a helper for simple cases
30
29
-* ta/quiet-pull (Sat Nov 15 01:14:24 2008 +0100) 1 commit
30
- - Teach/Fix pull/fetch -q/-v options
31
+Should be in 1.6.1-rc1.
32
32
-This has my fixes to preserve "fetch -v -v" behaviour squashed in.
33
+* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits
34
+ + fast-export: use an unsorted string list for extra_refs
35
+ + Add new testcase to show fast-export does not always exports all
36
+ tags
37
34
-----------------------------------------------------------------
35
-[Graduated to "master"]
38
+Should be in 1.6.1-rc1 and backmerged to 'maint'.
39
+
40
+* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
41
+ + Document levenshtein.c
42
+ + Fix deletion of last character in levenshtein distance
43
+
44
+Should be in 1.6.1-rc1.
45
+
46
+* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit
47
+ + compat/mingw.c: Teach mingw_rename() to replace read-only files
48
+
49
+Should be in 1.6.1-rc1 and backmerged to 'maint'.
50
+
51
+* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits
52
+ + builtin_clone: use strbuf in cmd_clone()
53
+ + builtin-clone: use strbuf in clone_local() and
54
+ copy_or_link_directory()
55
+ + builtin-clone: use strbuf in guess_dir_name()
56
+
57
+Should be in 1.6.1-rc1.
58
+
59
+* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
60
+ - git-p4: fix keyword-expansion regex
61
+
62
+Waiting for Ack from git-p4 folks.
63
+
64
+* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
65
+ - bisect: teach "skip" to accept special arguments like "A..B"
66
+
67
+Should be in 1.6.1-rc1.
68
+
69
+* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
70
+ - bisect: add "--no-replace" option to bisect without using replace
71
+ refs
72
+ - rev-list: make it possible to disable replacing using "--no-
73
+ bisect-replace"
74
+ - bisect: use "--bisect-replace" options when checking merge bases
75
+ - merge-base: add "--bisect-replace" option to use fixed up revs
76
+ - commit: add "bisect_replace_all" prototype to "commit.h"
77
+ - rev-list: add "--bisect-replace" to list revisions with fixed up
78
+ history
79
+ - Documentation: add "git bisect replace" documentation
80
+ - bisect: add test cases for "git bisect replace"
81
+ - bisect: add "git bisect replace" subcommand
82
+
83
+I really hate the idea of introducing a potentially much more useful
84
+replacement of the existing graft mechanism and tie it very tightly to
85
+bisect, making it unusable from outside.
86
+
87
+ (1) I do not think "bisect replace" workflow is a practical and usable
88
+ one;
89
+
90
+ (2) The underlying mechanism to express "this object replaces that other
91
+ object" is much easier to work with than what the graft does which is
92
+ "the parents of this commit are these", and idea to use the normal
93
+ ref to point at them means this can potentially be used for
94
+ transferring the graft information across repositories, which the
95
+ current graft mechanism cannot do.
96
+
97
+ (3) Because I like the aspect (2) of this series so much, it deeply
98
+ disappoints and troubles me that this is implemented minimally near
99
+ the surface, and that it is controlled by the "bisect" Porcelain
100
+ alone, by explicitly passing command line arguments.
101
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
-
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
-
45
-Will need to further downmerge to 'maint'.
46
-
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
-
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
55
- + t5516: refactor oddball tests
56
-
57
-* dl/xdiff (Fri Nov 7 21:24:33 2008 -0800) 1 commit
58
- + xdiff: give up scanning similar lines early
59
-
60
-This performance fix may eventually need to be cherry-picked to 'maint'.
61
-
62
-* lt/decorate (Wed Nov 12 11:51:28 2008 +0100) 7 commits
63
- + rev-list documentation: clarify the two parts of history
64
- simplification
65
- + Document "git log --simplify-by-decoration"
66
- + Document "git log --source"
67
- + revision traversal: '--simplify-by-decoration'
68
- + Make '--decorate' set an explicit 'show_decorations' flag
69
- + revision: make tree comparison functions take commits rather than
70
- trees
71
- + Add a 'source' decorator for commits
72
-
73
-* gb/gitweb-snapshot-pathinfo (Sun Nov 2 10:21:39 2008 +0100) 3 commits
74
- + gitweb: embed snapshot format parameter in PATH_INFO
75
- + gitweb: retrieve snapshot format from PATH_INFO
76
- + gitweb: make the supported snapshot formats array global
77
-
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
-
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
84
- + only textconv regular files
85
- + userdiff: require explicitly allowing textconv
86
- + refactor userdiff textconv code
87
- + add userdiff textconv tests
88
- + document the diff driver textconv feature
89
- + diff: add missing static declaration
90
-
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.
93
-
94
-An update to the one above.
95
-
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
99
- + pack-objects: don't leak pack window reference when splitting
100
- packs
101
- + extend test coverage for latest pack corruption resilience
102
- improvements
103
- + pack-objects: allow "fixing" a corrupted pack without a full
104
- repack
105
- + make find_pack_revindex() aware of the nasty world
106
- + make check_object() resilient to pack corruptions
107
- + make packed_object_info() resilient to pack corruptions
108
- + make unpack_object_header() non fatal
109
- + better validation on delta base object offsets
110
- + close another possibility for propagating pack corruption
111
-
112
-* mv/remote-rename (Mon Nov 10 21:43:03 2008 +0100) 4 commits
113
- + git-remote: document the migration feature of the rename
114
- subcommand
115
- + git-remote rename: migrate from remotes/ and branches/
116
- + remote: add a new 'origin' variable to the struct
117
- + Implement git remote rename
102
+I think a mechanism like this should be added to replace grafts, but it
103
+should always be enabled for normal revision traversal operation, while
104
+always disabled for object enumeration and transfer operation (iow, fsck,
105
+fetch and push should use the real ancestry information recorded in the
106
+underlying objects, while rev-list, log, etc. should always use the
107
+replaced objects). I have a suspicion that even cat-file could honor it.
108
109
----------------------------------------------------------------
120
-[Will merge to "master" soon]
110
+[Graduated to "master"]
111
112
* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit
113
+ repack: only unpack-unreachable if we are deleting redundant packs
@@ -132,9 +122,18 @@ which makes sense. This does not have to go to 'maint', though.
122
+ define empty tree sha1 as a macro
123
124
----------------------------------------------------------------
135
-[Actively Cooking]
125
+[Will merge to "master" soon]
126
+
127
+* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
128
+ + Fix index preloading for racy dirty case
129
+ + Add cache preload facility
130
+
131
+* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits
132
+ + Retain multiple -q/-v occurrences in git pull
133
+ + Teach/Fix pull/fetch -q/-v options
134
137
-* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
135
+* nd/narrow (Tue Nov 18 06:33:16 2008 -0500) 10 commits
136
+ + t2104: touch portability fix
137
+ grep: skip files outside sparse checkout area
138
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
139
+ Prevent diff machinery from examining worktree outside sparse
@@ -147,26 +146,25 @@ which makes sense. This does not have to go to 'maint', though.
146
+ Introduce CE_NO_CHECKOUT bit
147
+ Extend index to save more flags
148
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.
149
+* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
150
+ + git send-email: ask less questions when --compose is used.
151
+ + git send-email: add --annotate option
152
+ + git send-email: interpret unknown files as revision lists
153
+ + git send-email: make the message file name more specific.
154
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
+[Actively Cooking]
157
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.
158
+* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
159
+ - [DONTMERGE] Add -k/--keep-going option to mergetool
160
+ - Add -y/--no-prompt option to mergetool
161
+ - Fix some tab/space inconsistencies in git-mergetool.sh
162
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
163
+Jeff had good comments on the last one; the discussion needs concluded,
164
+and also waiting for comments from the original author (Ted).
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.
166
+* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
167
+ - autoconf: Enable threaded delta search when pthreads are supported
168
169
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
170
+ blame: show "previous" information in --porcelain/--incremental
@@ -190,3 +188,13 @@ continue.
188
This would be the right thing to do for command line use,
189
but gitk will be hit due to tcl/tk's limitation, so I am holding
190
this back for now.
191
+
192
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
193
+ - git-am --forge: add Signed-off-by: line for the author
194
+ - git-am: clean-up Signed-off-by: lines
195
+ - stripspace: add --log-clean option to clean up signed-off-by:
196
+ lines
197
+ - stripspace: use parse_options()
198
+ - Add "git am -s" test
199
+ - git-am: refactor code to add signed-off-by line for the committer
200
+