What's cooking (2008/09 #03)
Junio C Hamano committed
Sep 19, 2008 at 13:55 UTC
8d7157da2491de814e77330182bdd7c076d7e69f
1 file changed
+110
-110
whats-cooking.txt
+110
-110
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Sep 2008, #02; Wed, 10)
2
-X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
3
-X-next-at: c8d31b67b3f0e13f6b8ad782dadc6e8a8bc06bbb
1
+Subject: What's cooking in git.git (Sep 2008, #03; Fri, 19)
2
+X-master-at: 3791f77c28f233df121da2f83abf7eefc7b49b69
3
+X-next-at: 724951a306cebd5ce76602b9a0394df74ce52174
4
5
-What's cooking in git.git (Sep 2008, #02; Wed, 10)
5
+What's cooking in git.git (Sep 2008, #03; Fri, 19)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -12,99 +12,68 @@ 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
+By the way, I'll be on vacation from Sep 24 til Oct 08, but e-mail based
16
+proposal/review/discussion/improvement cycle and the distributed nature of
17
+git mean that it shouldn't keep the participants from further working on
18
+the system. Hopefully when I come back I'll see a much improved git ;-).
19
+
20
----------------------------------------------------------------
21
[New Topics]
22
18
-Many 'maint' material to go through the usual 'next' to 'master' to
19
-'maint' cycle..
20
-
21
-* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
22
- + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
23
+* mg/maint-remote-fix (Thu Sep 18 18:11:02 2008 +0200) 1 commit
24
+ - make "git remote" report multiple URLs
25
24
-* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
25
- + git-rebase--interactive: auto amend only edited commit
26
- + git-rebase-interactive: do not squash commits on abort
26
+Still with a minor nit but I think this is an improvement.
27
28
-* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
29
- + checkout: do not lose staged removal
28
+* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
29
+ - t7400: Add short "git submodule add" testsuite
30
31
-* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
32
- + Fix permission bits on sources checked out with an overtight umask
31
+Waiting for a reroll.
32
34
-* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
35
- - wt-status: Teach how to discard changes in the working directory
36
- - wt-status: Split header generation into three functions
33
+* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
34
+ + Documentation: Refer to git-rebase(1) to warn against rewriting
35
+ + Documentation: new upstream rebase recovery section in git-rebase
36
38
-This is what I commented as "making status output even chattier", but
39
-parked here to see what people think.
37
+I think the last one on "recommended practice" needs discussion. I do not
38
+think it describes _the_ recommended workflow, although I think (1) what
39
+is recommended in the draft does make sense within its own scope, and (2)
40
+it may be impossible to come up with _the_ recommended workflow anyway.
41
41
-* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
42
- - t7603: add new testcases to ensure builtin-commit uses
43
- reduce_heads()
44
- - builtin-commit: use commit_tree()
45
- - commit_tree(): add a new author parameter
42
+* bc/maint-diff-hunk-header-fix (Thu Sep 18 17:44:33 2008 -0500) 3 commits
43
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
44
+ selection
45
+ + diff.c: associate a flag with each pattern and use it for
46
+ compiling regex
47
+ + diff.c: return pattern entry pointer rather than just the hunk
48
+ header pattern
49
47
-* pb/autocorrect-wrapper (Wed Sep 10 14:44:20 2008 -0700) 2 commits
48
- - Fixup -- waiting for response
49
- - git wrapper: also uses aliases to suggest mistyped commands
50
+* bc/master-diff-hunk-header-fix (Thu Sep 18 20:32:50 2008 -0700) 4 commits
51
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
52
+ hunk-header-fix
53
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
54
+ selection
55
+ + diff.c: associate a flag with each pattern and use it for
56
+ compiling regex
57
+ + diff.c: return pattern entry pointer rather than just the hunk
58
+ header pattern
59
51
-* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
52
- - push: receiver end advertises refs from alternate repositories
53
- - push: prepare sender to receive extended ref information from the
54
- receiver
55
- - receive-pack: make it a builtin
56
- - is_directory(): a generic helper function
60
+I've commented on these two branches in a separate message.
61
62
----------------------------------------------------------------
63
[Graduated to "master"]
64
61
-* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
62
- + diff: Help "less" hide ^M from the output
63
-
64
-* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
65
- + checkout: do not check out unmerged higher stages randomly
66
-
67
-This is the same one as the bottom of "better conflict resolution" series.
68
-
69
-* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
70
- + configure: auto detect dynamic library path switches
71
- + Makefile: Allow CC_LD_DYNPATH to be overriden
72
-
73
-I decided to push this forward; it might break minority configurations,
74
-but it appears nobody pays attention until it actually hurts, so let's see
75
-what happens when this hits 'master'.
76
-
77
-* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
78
- + Add help.autocorrect to enable/disable autocorrecting
79
- + git wrapper: DWIM mistyped commands
80
-
81
-----------------------------------------------------------------
82
-[Stalled -- Needs Action to Proceed (or to be dropped)]
83
-
84
-* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
85
- - Use xdiff caching to improve git blame performance
86
- - Allow xdiff machinery to cache hash results for a file
87
- - Always initialize xpparam_t to 0
88
- - Bypass textual patch generation and parsing in git blame
89
- - Allow alternate "low-level" emit function from xdl_diff
90
-
91
-Réne had good comments on how the callback should be structured.
92
-
93
-* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
94
- - git-am: Pass the --directory option through to git-apply
95
-
96
-I think this is still buggy and drops the option when am stops with
97
-conflicts.
65
+* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
66
+ + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
67
99
-* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
100
- - Teach git.el to mark/unmark files by regexp
101
- - git.el: Diff only file at point by default
68
+* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
69
+ + git-rebase--interactive: auto amend only edited commit
70
+ + git-rebase-interactive: do not squash commits on abort
71
103
-These are still queued but Alexandre had improvement requests so these
104
-will likely be dropped.
72
+* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
73
+ + checkout: do not lose staged removal
74
106
-----------------------------------------------------------------
107
-[Will be merged to "master" soon]
75
+* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
76
+ + Fix permission bits on sources checked out with an overtight umask
77
78
* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
79
+ t5300: improve SHA1 collision test
@@ -137,8 +106,46 @@ will likely be dropped.
106
+ diff --quiet: make it synonym to --exit-code >/dev/null
107
+ diff Porcelain: do not disable auto index refreshing on -C -C
108
109
+* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
110
+ + discard_cache: reset lazy name_hash bit
111
+
112
+* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
113
+ + diff: vary default prefix depending on what are compared
114
+
115
----------------------------------------------------------------
141
-[Actively Cooking]
116
+[Stalled -- Needs Action to Proceed (or to be dropped)]
117
+
118
+* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
119
+ - Use xdiff caching to improve git blame performance
120
+ - Allow xdiff machinery to cache hash results for a file
121
+ - Always initialize xpparam_t to 0
122
+ - Bypass textual patch generation and parsing in git blame
123
+ - Allow alternate "low-level" emit function from xdl_diff
124
+
125
+Réne had good comments on how the callback should be structured.
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
+I think this is still buggy and drops the option when am stops with
131
+conflicts.
132
+
133
+----------------------------------------------------------------
134
+[Will be merged to "master" soon]
135
+
136
+* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
137
+ + builtin-merge: release the lockfile in try_merge_strategy()
138
+ + merge-recursive: get rid of virtual_id
139
+ + merge-recursive: move current_{file,directory}_set to struct
140
+ merge_options
141
+ + merge-recursive: move the global obuf to struct merge_options
142
+ + merge-recursive: get rid of the index_only global variable
143
+ + merge-recursive: move call_depth to struct merge_options
144
+ + cherry-pick/revert: make direct internal call to merge_tree()
145
+ + builtin-merge: avoid run_command_v_opt() for recursive and subtree
146
+ + merge-recursive: introduce merge_options
147
+ + merge-recursive.c: Add more generic merge_recursive_generic()
148
+ + Split out merge_recursive() to merge-recursive.c
149
150
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
151
+ diff --dirstat-by-file: count changed files, not lines
@@ -148,7 +155,16 @@ will likely be dropped.
155
directories
156
157
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
151
- - git-apply:--include=pathspec
158
+ + git-apply:--include=pathspec
159
+
160
+* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
161
+ + t7603: add new testcases to ensure builtin-commit uses
162
+ reduce_heads()
163
+ + builtin-commit: use commit_tree()
164
+ + commit_tree(): add a new author parameter
165
+
166
+* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
167
+ + git wrapper: also use aliases to correct mistyped commands
168
169
* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
170
+ builtin-commit.c: show on which branch a commit was added
@@ -174,18 +190,22 @@ will likely be dropped.
190
+ checkout -f: allow ignoring unmerged paths when checking out of
191
the index
192
177
-* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
178
- + date/time: do not get confused by fractional seconds
193
+* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
194
+ + push: receiver end advertises refs from alternate repositories
195
+ + push: prepare sender to receive extended ref information from the
196
+ receiver
197
+ + receive-pack: make it a builtin
198
+ + is_directory(): a generic helper function
199
180
-* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
181
- + discard_cache: reset lazy name_hash bit
200
+----------------------------------------------------------------
201
+[Actively Cooking]
202
183
-I spotted this by accident while working on something unrelated.
203
+* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
204
+ + wt-status: Teach how to discard changes in the working directory
205
+ + wt-status: Split header generation into three functions
206
185
-When a program calls discard_cache() to read the index again, we do not
186
-properly re-initialize the name_hash structure that is used by the case
187
-insensitivitly logic. This _might_ improve issues people may be having on
188
-case insensitive filesystems. I dunno.
207
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
208
+ + date/time: do not get confused by fractional seconds
209
210
* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
211
+ git-add --intent-to-add (-N)
@@ -193,26 +213,6 @@ case insensitive filesystems. I dunno.
213
Teaches "git add" to record only the intent to add a path later.
214
I rerolled this without the fake empty blob object.
215
196
-* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
197
- + builtin-merge: release the lockfile in try_merge_strategy()
198
- + merge-recursive: get rid of virtual_id
199
- + merge-recursive: move current_{file,directory}_set to struct
200
- merge_options
201
- + merge-recursive: move the global obuf to struct merge_options
202
- + merge-recursive: get rid of the index_only global variable
203
- + merge-recursive: move call_depth to struct merge_options
204
- + cherry-pick/revert: make direct internal call to merge_tree()
205
- + builtin-merge: avoid run_command_v_opt() for recursive and subtree
206
- + merge-recursive: introduce merge_options
207
- + merge-recursive.c: Add more generic merge_recursive_generic()
208
- + Split out merge_recursive() to merge-recursive.c
209
-
210
-* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
211
- + diff: vary default prefix depending on what are compared
212
-
213
-As some people may have noticed, I've been running with this one when
214
-sending out "How about this" patches to the discussion threads.
215
-
216
* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
217
- revision --simplify-merges: incremental simplification
218
- revision --simplify-merges: prepare for incremental simplification