What's cooking (2008/12 #01)
Junio C Hamano committed
Dec 2, 2008 at 22:55 UTC
2c7246466abcc8c4cc980e86fa065fc57a9d1d66
1 file changed
+120
-73
whats-cooking.txt
+120
-73
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Nov 2008, #06; Wed, 26)
2
-X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff
3
-X-next-at: 406979f7fe53d139cdb79bf8c5eecf8735f4f146
1
+Subject: What's cooking in git.git (Dec 2008, #01; Tue, 02)
2
+X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10
3
+X-next-at: 44b0c4a7f55234e12cead3e1909c17be7c068dca
4
5
-What's cooking in git.git (Nov 2008, #06; Wed, 26)
5
+What's cooking in git.git (Dec 2008, #01; Tue, 02)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -12,14 +12,75 @@ 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
+As we have already passed -rc1, things queued in 'next' let alone 'pu' are
16
+unlikely to be merged to 'master' by the end of year unless otherwise
17
+noted.
18
+
19
----------------------------------------------------------------
20
[New Topics]
21
22
+* gb/gitweb-patch (Sat Nov 29 14:41:11 2008 +0100) 2 commits
23
+ - [DONTMERGE: wait for signoff] gitweb: links to patch action in
24
+ commitdiff and shortlog view
25
+ - gitweb: add patch view
26
+
27
+* lt/reset-merge (Mon Dec 1 09:30:31 2008 -0800) 1 commit
28
+ + Add 'merge' mode to 'git reset'
29
+
30
+Unfortunately, I cannot write down a good use case in what circumstances
31
+this is needed, even though I do recall that I occasionally (perhaps once
32
+every two months) needed to do "read-tree -m -u" myself in the past, and
33
+this patch brings that feature close to Porcelain. On the other hand, the
34
+existing "reset --mixed" is very easily explained ("after starting to add
35
+changes to the staging area, you realized that you screwed up, and you
36
+want to redo it from scratch"). Therefore, I cannot justify what the log
37
+message of this change claims myself.
38
+
39
+* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
40
+ + git add --intent-to-add: do not let an empty blob be committed by
41
+ accident
42
+ + git add --intent-to-add: fix removal of cached emptiness
43
+ + builtin-rm.c: explain and clarify the "local change" logic
44
+ + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
45
+ + Extend index to save more flags
46
+
47
+As intent-to-add index entry is a new feature for 1.6.1, it probably is a
48
+good idea to merge this to 'master'. Nitpicks and bugfixes are very much
49
+appreciated.
50
+
51
+* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
52
+ - In add --patch, Handle K,k,J,j slightly more gracefully.
53
+ - Add / command in add --patch
54
+ - git-add -i/-p: Change prompt separater from slash to comma
55
+
56
+There are some other useful bits and pieces around this area exchanged on
57
+the list with the author of these patches. I think it would become a
58
+useful series after reassembling their pieces. Waiting for v2.
59
+
60
+* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
61
+ - gitweb: Fix handling of non-ASCII characters in inserted HTML
62
+ files.
63
+
64
+Possibly a bugfix worthy to have in 1.6.1.
65
+
66
+* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
67
+ - clone: test the new HEAD detection logic
68
+ - Merge commit 'HEAD@{2}' into HEAD
69
+ - upload-pack: send the HEAD information
70
+ - clone: find the current branch more explicitly
71
+ - connect.c::read_extra_info(): find where HEAD points at
72
+ - connect.c::read_extra_info(): prepare to receive more than server
73
+ capabilities
74
+ - get_remote_heads(): refactor code to read "server capabilities"
75
+
76
+This is no way meant for 1.6.1, let alone next, yet.
77
+
78
+----------------------------------------------------------------
79
+[Graduated to "master"]
80
+
81
* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit
82
+ git-remote: add verbose mode to git remote update
83
21
-Should be in 1.6.1-rc1.
22
-
84
* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits
85
+ remove the unused files interpolate.c and interpolate.h
86
+ daemon: deglobalize variable 'directory'
@@ -28,44 +89,75 @@ Should be in 1.6.1-rc1.
89
+ merge-recursive: use strbuf_expand() instead of interpolate()
90
+ add strbuf_expand_dict_cb(), a helper for simple cases
91
31
-Should be in 1.6.1-rc1.
32
-
92
* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits
93
+ fast-export: use an unsorted string list for extra_refs
94
+ Add new testcase to show fast-export does not always exports all
95
tags
96
38
-Should be in 1.6.1-rc1 and backmerged to 'maint'.
39
-
97
* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits
98
+ Document levenshtein.c
99
+ Fix deletion of last character in levenshtein distance
100
44
-Should be in 1.6.1-rc1.
45
-
101
* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit
102
+ compat/mingw.c: Teach mingw_rename() to replace read-only files
103
49
-Should be in 1.6.1-rc1 and backmerged to 'maint'.
50
-
104
* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits
105
+ builtin_clone: use strbuf in cmd_clone()
106
+ builtin-clone: use strbuf in clone_local() and
107
copy_or_link_directory()
108
+ builtin-clone: use strbuf in guess_dir_name()
109
57
-Should be in 1.6.1-rc1.
58
-
110
* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit
111
- git-p4: fix keyword-expansion regex
112
62
-Waiting for Ack from git-p4 folks.
63
-
113
* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit
114
- bisect: teach "skip" to accept special arguments like "A..B"
115
116
Should be in 1.6.1-rc1.
117
118
+* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits
119
+ + Fix index preloading for racy dirty case
120
+ + Add cache preload facility
121
+
122
+* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits
123
+ + Retain multiple -q/-v occurrences in git pull
124
+ + Teach/Fix pull/fetch -q/-v options
125
+
126
+* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits
127
+ + git send-email: ask less questions when --compose is used.
128
+ + git send-email: add --annotate option
129
+ + git send-email: interpret unknown files as revision lists
130
+ + git send-email: make the message file name more specific.
131
+
132
+After merging these to 'master' I found a breakage which I hopefully
133
+fixed.
134
+
135
+----------------------------------------------------------------
136
+[Will merge to "master" soon]
137
+
138
+What are you looking for? We are in -rc ;-)
139
+
140
+----------------------------------------------------------------
141
+[On Hold]
142
+
143
+* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits
144
+ - [DONTMERGE] Add -k/--keep-going option to mergetool
145
+ - Add -y/--no-prompt option to mergetool
146
+ - Fix some tab/space inconsistencies in git-mergetool.sh
147
+
148
+Jeff had good comments on the last one; the discussion needs concluded,
149
+and also waiting for comments from the original author (Ted).
150
+
151
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
152
+ + blame: show "previous" information in --porcelain/--incremental
153
+ format
154
+ + git-blame: refactor code to emit "porcelain format" output
155
+
156
+* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
157
+ - autoconf: Enable threaded delta search when pthreads are supported
158
+
159
+Rebased to 'master', that introduced NO_PTHREADS.
160
+
161
* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
162
- bisect: add "--no-replace" option to bisect without using replace
163
refs
@@ -106,33 +198,15 @@ fetch and push should use the real ancestry information recorded in the
198
underlying objects, while rev-list, log, etc. should always use the
199
replaced objects). I have a suspicion that even cat-file could honor it.
200
109
-----------------------------------------------------------------
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
114
-
115
-This makes "repack -A -d" without -d do the same thing as "repack -a -d",
116
-which makes sense. This does not have to go to 'maint', though.
117
-
118
-* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits
119
- + status: show "-v" diff even for initial commit
120
- + Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
121
- + wt-status: refactor initial commit printing
122
- + define empty tree sha1 as a macro
123
-
124
-----------------------------------------------------------------
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
-
135
-* nd/narrow (Tue Nov 18 06:33:16 2008 -0500) 10 commits
201
+* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 18 commits
202
+ - wt-status: show sparse checkout info
203
+ - Introduce default sparse patterns (core.defaultsparse)
204
+ - checkout: add new options to support sparse checkout
205
+ - clone: support sparse checkout with --sparse-checkout option
206
+ - unpack_trees(): add support for sparse checkout
207
+ - unpack_trees(): keep track of unmerged entries
208
+ - Introduce "sparse patterns"
209
+ - Merge branch 'master' into nd/narrow
210
+ t2104: touch portability fix
211
+ grep: skip files outside sparse checkout area
212
+ checkout_entry(): CE_NO_CHECKOUT on checked out entries.
@@ -146,33 +220,7 @@ which makes sense. This does not have to go to 'maint', though.
220
+ Introduce CE_NO_CHECKOUT bit
221
+ Extend index to save more flags
222
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
-
155
-----------------------------------------------------------------
156
-[Actively Cooking]
157
-
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
-
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
-* 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
171
- format
172
- + git-blame: refactor code to emit "porcelain format" output
173
-
174
-----------------------------------------------------------------
175
-[On Hold]
223
+Kicked back to 'on hold' until 1.6.1 final by popular(?) demand.
224
225
* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
226
- "git push": tellme-more protocol extension
@@ -197,4 +245,3 @@ this back for now.
245
- stripspace: use parse_options()
246
- Add "git am -s" test
247
- git-am: refactor code to add signed-off-by line for the committer
200
-