What's in/cooking updates
Junio C Hamano committed
Oct 14, 2008 at 00:21 UTC
c3c329a3007cca8556a4e4c4639788d2298c8727
2 files changed
+254
whats/cooking/2008/10/03.txt
new
+223
@@ -0,0 +1,223 @@
1
+Subject: What's cooking in git.git (Oct 2008, #03; Tue, 14)
2
+X-master-at: 67faaaba8338cf59c212ce5239eeb223a77acdf0
3
+X-next-at: f1ba443bf7f7fae740f81058fca0bcff3613d999
4
+
5
+What's cooking in git.git (Oct 2008, #03; Tue, 14)
6
+--------------------------------------------------
7
+
8
+Here are the topics that have been cooking. Commits prefixed
9
+with '-' are only in 'pu' while commits prefixed with '+' are
10
+in 'next'.
11
+
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
+This round I haven't added anything new yet. Just getting my development
16
+repository back into shape and in sync with what I received from Shawn.
17
+
18
+----------------------------------------------------------------
19
+[New Topics]
20
+
21
+* js/maint-fetch-update-head (Mon Oct 13 11:36:52 2008 +0200) 1 commit
22
+ - Fix fetch/pull when run without --update-head-ok
23
+
24
+This looked sane to me.
25
+
26
+----------------------------------------------------------------
27
+[Stuck Topics]
28
+
29
+* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
30
+ - grep: skip files outside sparse checkout area
31
+ - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
32
+ - Prevent diff machinery from examining worktree outside sparse
33
+ checkout
34
+ - ls-files: Add tests for --sparse and friends
35
+ - update-index: add --checkout/--no-checkout to update
36
+ CE_NO_CHECKOUT bit
37
+ - update-index: refactor mark_valid() in preparation for new options
38
+ - ls-files: add options to support sparse checkout
39
+ - Introduce CE_NO_CHECKOUT bit
40
+ - Extend index to save more flags
41
+
42
+Recently updated with a repost. Shawn says he's been too swamped at
43
+day-job to actively review the series. There has been some discussion on
44
+list about it so its not stalled, but it needs more eyeballs.
45
+
46
+----------------------------------------------------------------
47
+[Stalled -- Needs Action to Proceed (or to be dropped)]
48
+
49
+* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
50
+ - t7400: Add short "git submodule add" testsuite
51
+
52
+Still waiting for a reroll. Should be dropped next week if we don't
53
+get one during this coming week.
54
+
55
+* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
56
+ - Use xdiff caching to improve git blame performance
57
+ - Allow xdiff machinery to cache hash results for a file
58
+ - Always initialize xpparam_t to 0
59
+ - Bypass textual patch generation and parsing in git blame
60
+ - Allow alternate "low-level" emit function from xdl_diff
61
+
62
+Réne had good comments on how the callback should be structured.
63
+
64
+* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
65
+ - git-am: Pass the --directory option through to git-apply
66
+
67
+I think this is still buggy and drops the option when am stops with
68
+conflicts.
69
+
70
+----------------------------------------------------------------
71
+[Will be merged to 'master' soon]
72
+
73
+* pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits
74
+ + tutorial: update output of git commit
75
+ + reformat informational commit message
76
+ + git commit: Reformat output somewhat
77
+ + builtin-commit.c: show on which branch a commit was added
78
+
79
+Shawn thinks this topic is settled for now, and I see that the new output
80
+format does not bother me very much, so please expect this to be merged
81
+soon.
82
+
83
+----------------------------------------------------------------
84
+[Actively Cooking]
85
+
86
+* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
87
+ + Documentation: Refer to git-rebase(1) to warn against rewriting
88
+ + Documentation: new upstream rebase recovery section in git-rebase
89
+
90
+Shawn says that an update came in recently, but they are not here yet.
91
+I'd need to dig it up, but I haven't had time.
92
+
93
+* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit
94
+ + rebase --no-verify
95
+
96
+This adds --no-verify to git rebase, to avoid the pre-rebase hook. Lacks
97
+documentation but otherwise looks sound.
98
+
99
+* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit
100
+ + builtin-commit: use reduce_heads() only when appropriate
101
+
102
+Fixes "git merge --no-ff --no-commit".
103
+
104
+* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit
105
+ + rebase: Support preserving merges in non-interactive mode
106
+
107
+* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits
108
+ - rebase-i-p: if todo was reordered use HEAD as the rewritten parent
109
+ - rebase-i-p: do not include non-first-parent commits touching
110
+ UPSTREAM
111
+ - rebase-i-p: only list commits that require rewriting in todo
112
+ - rebase-i-p: fix 'no squashing merges' tripping up non-merges
113
+ - rebase-i-p: delay saving current-commit to REWRITTEN if squashing
114
+ - rebase-i-p: use HEAD for updating the ref instead of mapping
115
+ OLDHEAD
116
+ - rebase-i-p: test to exclude commits from todo based on its parents
117
+
118
+Changes the `rebase -i -p` behavior to behave like git sequencer's
119
+rewrite of `rebase -i` would behave.
120
+
121
+* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit
122
+ . rebase--interactive: fix parent rewriting for dropped commits
123
+
124
+Tentatively dropped from everwhere, waiting for a reroll together with
125
+sh/rebase-i-p.
126
+
127
+* pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits
128
+ - (squash): index-pack: do not unconditionally make packfile read-
129
+ only
130
+ - Do not rename read-only files during a push
131
+
132
+Supposedly fixes pack file renames on Windows. The (squash) patch is my
133
+attempt to fix its breakage.
134
+
135
+* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit
136
+ - describe: Make --tags and --all match lightweight tags more often
137
+
138
+When the user gives --tags, the request is asking to treat lightweight and
139
+annotated tags at equal weight, and if lightweight ones are closer, they
140
+should be used.
141
+
142
+* gb/formatpatch-autonbr (Sun Oct 12 22:18:02 2008 -0700) 2 commits
143
+ - (squash) adjust test vector for new behaviour of format-patch
144
+ - format-patch: autonumber by default
145
+
146
+* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits
147
+ - diff: add filter for converting binary to text
148
+ - diff: introduce diff.<driver>.binary
149
+ - diff: unify external diff and funcname parsing code
150
+ - t4012: use test_cmp instead of cmp
151
+
152
+A general cleanup on how diff drivers are implemented. Its still
153
+missing documentation updates and tests but doesn't break anything
154
+current as far as I can tell. It needs more review before it can
155
+be slated for 'next'.
156
+
157
+* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits
158
+ + check-attr: Add --stdin option
159
+ + check-attr: add an internal check_attr() function
160
+
161
+Batch attr lookup via --stdin, for gitk and git-gui.
162
+
163
+* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit
164
+ + Implement git clone -v
165
+
166
+Does what it says it does. This may be ready for master soon,
167
+its a pretty trivial change.
168
+
169
+* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit
170
+ + gitweb: refactor input parameters parse/validation
171
+
172
+A major cleanup on the way gitweb parses its input arguments.
173
+Future gitweb patches to add more arguments into the PATH_INFO
174
+depend upon this initial cleanup work.
175
+
176
+* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit
177
+ - compat/cygwin.c - Use cygwin's stat if core.filemode == true
178
+
179
+Is ready for 'next'.
180
+
181
+* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
182
+ - gitweb: Better processing format string in custom links in navbar
183
+
184
+Waiting for some sort of response from Pasky.
185
+
186
+----------------------------------------------------------------
187
+[On Hold]
188
+
189
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
190
+ - revision --simplify-merges: incremental simplification
191
+ - revision --simplify-merges: prepare for incremental simplification
192
+
193
+I started making this incremental but the progress is not
194
+so great.
195
+
196
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
197
+ . git-am --forge: add Signed-off-by: line for the author
198
+ . git-am: clean-up Signed-off-by: lines
199
+ . stripspace: add --log-clean option to clean up signed-off-by:
200
+ lines
201
+ . stripspace: use parse_options()
202
+ . Add "git am -s" test
203
+ . git-am: refactor code to add signed-off-by line for the committer
204
+
205
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
206
+ - "git push": tellme-more protocol extension
207
+
208
+This seems to have a deadlock during communication between the peers.
209
+Someone needs to pick up this topic and resolve the deadlock before it can
210
+continue.
211
+
212
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
213
+ - blame: show "previous" information in --porcelain/--incremental
214
+ format
215
+ - git-blame: refactor code to emit "porcelain format" output
216
+
217
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
218
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
219
+ asked for
220
+
221
+This would be the right thing to do for command line use,
222
+but gitk will be hit due to tcl/tk's limitation, so I am holding
223
+this back for now.
whats/in/2008/10/03.txt
new
+31
@@ -0,0 +1,31 @@
1
+Subject: What's in git.git (Oct 2008, #03; Tue, 14)
2
+X-maint-at: 6c1679254cb6be7b268d1431595e1626bf18792d
3
+X-master-at: 67faaaba8338cf59c212ce5239eeb223a77acdf0
4
+X-maint-was: 72d404debaa804fca82fd9cf710fbde48c7305c6
5
+X-master-was: 5c283eb13c94be6ca974aa722159dc9838d10d97
6
+
7
+What's in git.git (Oct 2008, #03; Tue, 14)
8
+
9
+ maint 6c16792 (Update draft release notes to 1.6.0.3)
10
+ master 67faaab (Update draft release notes to 1.6.1)
11
+------------------------------------------------------------------------
12
+
13
+Just trying to get my development repository back in sync with what I
14
+received from Shawn. Thanks to everybody, I think maint is ready for
15
+1.6.0.3.
16
+
17
+* The 'maint' branch has these fixes since the last announcement.
18
+
19
+Junio C Hamano (1):
20
+ Update draft release notes to 1.6.0.3
21
+
22
+
23
+* The 'master' branch has these since the last announcement
24
+ in addition to the above.
25
+
26
+Jeff King (1):
27
+ tests: shell negation portability fix
28
+
29
+Junio C Hamano (1):
30
+ Update draft release notes to 1.6.1
31
+