What's cooking 2008-09 #04
Shawn O. Pearce committed
Sep 29, 2008 at 11:45 UTC
01a8a64a95a3ea6f330919348f3f15ffa53496c8
2 files changed
+519
whats/cooking/2008/09/05.txt
new
+341
@@ -0,0 +1,341 @@
1
+Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29)
2
+X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1
3
+X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458
4
+
5
+What's cooking in git.git (Sep 2008, #05; Mon, 29)
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
+If I have dropped anything recently its not because I don't want
16
+to apply it, it just slipped through the cracks. Please feel free
17
+to give me a gentle prod (and a patch resend or a pointer to the
18
+series on gmane). Thanks.
19
+
20
+----------------------------------------------------------------
21
+[New Topics]
22
+
23
+* gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits
24
+ - gitweb: generate parent..current URLs
25
+ - gitweb: parse parent..current syntax from pathinfo
26
+ - gitweb: generate project/action/hash URLs
27
+ - gitweb: parse project/action/hash_base:filename PATH_INFO
28
+
29
+This series just came in today. I haven't had a chance to look at
30
+it beyond stashing in `pu`.
31
+
32
+* mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits
33
+ - send-email: signedoffcc -> signedoffbycc, but handle both
34
+ - Docs: send-email: Create logical groupings for man text
35
+ - Docs: send-email: Remove unnecessary config variable description
36
+ - Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to
37
+ - send-email: change --no-validate to boolean --[no-]validate
38
+ - Docs: send-email: Man page option ordering
39
+ - Docs: send-email usage text much sexier
40
+ - Docs: send-email's usage text and man page mention same options
41
+
42
+This series has already gone through 3 iterations before I could
43
+start to carry it in-tree. I haven't had a chance to read it yet
44
+myself, so its sitting around in `pu` for futher review.
45
+
46
+* pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits
47
+ - gitweb: Sort the list of forks on the summary page by age
48
+ - gitweb: Clean-up sorting of project list
49
+
50
+I forgot to look at this series today. I meant to review and try
51
+to merge it to `next` before publishing. Will do that tomorrow.
52
+
53
+* ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits
54
+ - git pull: Support --preserve-merges as a flag to rebase
55
+ - git rebase: Support non-interactive merge-preserving rebase
56
+ - Prepare for non-interactive merge-preserving rebase
57
+
58
+Andreas says there's some issues in here. I'm waiting for a respin
59
+on the series before I look at it futher.
60
+
61
+* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
62
+ - make prune report removed objects on -v
63
+
64
+Just came in today. Looks sane. I'll drop it onto `next` tomorrow.
65
+
66
+----------------------------------------------------------------
67
+[Graduated to "master"]
68
+
69
+* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
70
+ + builtin-merge: release the lockfile in try_merge_strategy()
71
+ + merge-recursive: get rid of virtual_id
72
+ + merge-recursive: move current_{file,directory}_set to struct
73
+ merge_options
74
+ + merge-recursive: move the global obuf to struct merge_options
75
+ + merge-recursive: get rid of the index_only global variable
76
+ + merge-recursive: move call_depth to struct merge_options
77
+ + cherry-pick/revert: make direct internal call to merge_tree()
78
+ + builtin-merge: avoid run_command_v_opt() for recursive and subtree
79
+ + merge-recursive: introduce merge_options
80
+ + merge-recursive.c: Add more generic merge_recursive_generic()
81
+ + Split out merge_recursive() to merge-recursive.c
82
+
83
+(Tip at 4271666)
84
+
85
+* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
86
+ + diff --dirstat-by-file: count changed files, not lines
87
+
88
+(Tip at fd33777)
89
+
90
+* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
91
+ + safe_create_leading_directories(): make it about "leading"
92
+ directories
93
+
94
+(Tip at 5f0bdf5)
95
+
96
+* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
97
+ + git-apply:--include=pathspec
98
+
99
+(Tip at 6ecb1ee)
100
+
101
+* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
102
+ + t7603: add new testcases to ensure builtin-commit uses
103
+ reduce_heads()
104
+ + builtin-commit: use commit_tree()
105
+ + commit_tree(): add a new author parameter
106
+
107
+(Tip at 7a172b0)
108
+
109
+* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
110
+ + git wrapper: also use aliases to correct mistyped commands
111
+
112
+(Tip at 746c221)
113
+
114
+* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
115
+ + Fix AsciiDoc errors in merge documentation
116
+ + git-merge documentation: describe how conflict is presented
117
+ + checkout --conflict=<style>: recreate merge in a non-default style
118
+ + checkout -m: recreate merge when checking out of unmerged index
119
+ + Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-
120
+ resolution'
121
+ + git-merge-recursive: learn to honor merge.conflictstyle
122
+ + merge.conflictstyle: choose between "merge" and "diff3 -m" styles
123
+ + rerere: understand "diff3 -m" style conflicts with the original
124
+ + rerere.c: use symbolic constants to keep track of parsing states
125
+ + xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or
126
+ less
127
+ + xmerge.c: minimum readability fixups
128
+ + xdiff-merge: optionally show conflicts in "diff3 -m" style
129
+ + xdl_fill_merge_buffer(): separate out a too deeply nested function
130
+ + checkout --ours/--theirs: allow checking out one side of a
131
+ conflicting merge
132
+ + checkout -f: allow ignoring unmerged paths when checking out of
133
+ the index
134
+
135
+(Tip at 3407a7a)
136
+
137
+* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
138
+ + push: receiver end advertises refs from alternate repositories
139
+ + push: prepare sender to receive extended ref information from the
140
+ receiver
141
+ + receive-pack: make it a builtin
142
+ + is_directory(): a generic helper function
143
+
144
+(Tip at d79796b)
145
+
146
+* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
147
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
148
+ hunk-header-fix
149
+ + diff hunk pattern: fix misconverted "\{" tex macro introducers
150
+ + diff: fix "multiple regexp" semantics to find hunk header comment
151
+ + diff: use extended regexp to find hunk headers
152
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
153
+ hunk-header-fix
154
+ + diff: use extended regexp to find hunk headers
155
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
156
+ hunk-header-fix
157
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
158
+ selection
159
+ + diff.c: associate a flag with each pattern and use it for
160
+ compiling regex
161
+ + diff.c: return pattern entry pointer rather than just the hunk
162
+ header pattern
163
+
164
+(Tip at 92bb978)
165
+
166
+* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
167
+ + wt-status: Teach how to discard changes in the working directory
168
+ + wt-status: Split header generation into three functions
169
+
170
+(Tip at 4d6e4c4)
171
+
172
+* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
173
+ + make "git remote" report multiple URLs
174
+
175
+(Tip at 7d20e21)
176
+
177
+* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
178
+ + diff hunk pattern: fix misconverted "\{" tex macro introducers
179
+ + diff: use extended regexp to find hunk headers
180
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
181
+ selection
182
+ + diff.c: associate a flag with each pattern and use it for
183
+ compiling regex
184
+ + diff.c: return pattern entry pointer rather than just the hunk
185
+ header pattern
186
+
187
+(Tip at 96d1a8e)
188
+
189
+----------------------------------------------------------------
190
+[Old New Topics]
191
+
192
+* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
193
+ - grep: skip files that have not been checked out
194
+ - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
195
+ - Prevent diff machinery from examining worktree outside narrow
196
+ checkout
197
+ - Add tests for updating no-checkout entries in index
198
+ - ls-files: add --narrow-checkout option to "will checkout" entries
199
+ - update-index: add --checkout/--no-checkout to update
200
+ CE_NO_CHECKOUT bit
201
+ - update-index: refactor mark_valid() in preparation for new options
202
+ - Introduce CE_NO_CHECKOUT bit
203
+ - Extend index to save more flags
204
+
205
+[jc: This is an early half of the earlier series (I haven't had
206
+ chance to look at the updated series yet), and should be replaced
207
+ with the updated one posted recently.]
208
+
209
+I haven't touched this branch since I inherited it from Junio.
210
+I'd appreciate a resend or a pointer to the updated series so I
211
+can at least replace it.
212
+
213
+----------------------------------------------------------------
214
+[Stalled -- Needs Action to Proceed (or to be dropped)]
215
+
216
+* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
217
+ - t7400: Add short "git submodule add" testsuite
218
+
219
+[jc: Waiting for a reroll.]
220
+
221
+* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
222
+ - Use xdiff caching to improve git blame performance
223
+ - Allow xdiff machinery to cache hash results for a file
224
+ - Always initialize xpparam_t to 0
225
+ - Bypass textual patch generation and parsing in git blame
226
+ - Allow alternate "low-level" emit function from xdl_diff
227
+
228
+[jc: Réne had good comments on how the callback should be
229
+ structured.]
230
+
231
+* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
232
+ - git-am: Pass the --directory option through to git-apply
233
+
234
+[jc: I think this is still buggy and drops the option when am stops
235
+ with conflicts.]
236
+
237
+All three of these are stalled. I'm not going to drop them just
238
+yet, but Junio's comments still hold. If there's no action on
239
+these next week we may seem them drop off.
240
+
241
+----------------------------------------------------------------
242
+[Will be merged to 'master/maint' soon]
243
+
244
+* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
245
+ + git-add --intent-to-add (-N)
246
+
247
+Teaches "git add" to record only the intent to add a path later.
248
+[jc: I rerolled this without the fake empty blob object.]
249
+
250
+I'm inclined to merge this next week.
251
+
252
+(Tip at 3942581)
253
+
254
+----------------------------------------------------------------
255
+[Actively Cooking]
256
+
257
+* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
258
+ + Documentation: Refer to git-rebase(1) to warn against rewriting
259
+ + Documentation: new upstream rebase recovery section in git-rebase
260
+
261
+[jc: My impression from the last round of discusson on the third
262
+ patch in this series (not queued here) was that as long as we
263
+ do not present it as "One True Workflow", the description was
264
+ a good starting point, possibly others to add other recommended
265
+ flows later.]
266
+
267
+I haven't looked at this series yet. Based on Junios remarks above
268
+I'm looking for more input on this series before it goes anywhere.
269
+
270
+* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
271
+ + builtin-commit.c: show on which branch a commit was added
272
+
273
+[jc: Tentatively kicked back to "still cooking" status after
274
+ Jeff voiced his annoyance. I personally do not like making this
275
+ multi-line as Jeff suggested as an alternative (the message already
276
+ is too verbose to my taste).]
277
+
278
+Agree with Junio. Hence its still here.
279
+
280
+* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
281
+ + date/time: do not get confused by fractional seconds
282
+
283
+I need to look at this in more detail. I suspect we can merge
284
+this to master soon, but its been kicking around since Aug 16th.
285
+I need to look at it to see if there's any obvious reason why Junio
286
+has no notes on this branch and why it hasn't merged yet.
287
+
288
+----------------------------------------------------------------
289
+[On Hold]
290
+
291
+* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits
292
+ - revision --simplify-merges: incremental simplification
293
+ - revision --simplify-merges: prepare for incremental simplification
294
+
295
+[jc: I started making this incremental but the progress is not so great.]
296
+
297
+* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
298
+ - git-am --forge: add Signed-off-by: line for the author
299
+ - git-am: clean-up Signed-off-by: lines
300
+ - stripspace: add --log-clean option to clean up signed-off-by:
301
+ lines
302
+ - stripspace: use parse_options()
303
+ - Add "git am -s" test
304
+ - git-am: refactor code to add signed-off-by line for the committer
305
+
306
+[jc: The one at second from the tip needs reworking.]
307
+
308
+* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
309
+ - "git push": tellme-more protocol extension
310
+
311
+* jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
312
+ . WIP: start teaching the --whitespace=fix to merge machinery
313
+
314
+This has a merge conflict with `next` and isn't even in pu right now.
315
+
316
+* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
317
+ - blame: show "previous" information in --porcelain/--incremental
318
+ format
319
+ - git-blame: refactor code to emit "porcelain format" output
320
+
321
+I should look at this in more detail. We may be able to merge it
322
+to next soon-ish.
323
+
324
+* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
325
+ + merge: remove deprecated summary and diffstat options and config
326
+ variables
327
+
328
+[jc: This was previously in "will be in master soon" category,
329
+ but it turns out that the synonyms to the ones this one deletes
330
+ are fairly new invention that happend in 1.5.6 timeframe, and
331
+ we cannot do this just yet. Perhaps in 1.7.0, but with the loud
332
+ whining about moving git-foo out of $PATH we have been hearing,
333
+ it might not be a bad idea to drop this.]
334
+
335
+* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
336
+ - diff: enable "too large a rename" warning when -M/-C is explicitly
337
+ asked for
338
+
339
+[jc: This would be the right thing to do for command line use,
340
+ but gitk will be hit due to tcl/tk's limitation, so I am holding
341
+ this back for now.]
whats/in/2008/09/04.txt
new
+178
@@ -0,0 +1,178 @@
1
+Subject: What's in git.git (Sep 2008, #04; Mon, 29)
2
+X-maint-at: edb7e82f72106add9f2fbaf9d99d9532a72e3f91
3
+X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1
4
+X-maint-was: db87e3960c5a770db13c9ba9602b5e88848e2d1a
5
+X-master-was: c4275591fbb7d582c397b228e38dbb8419c89330
6
+
7
+What's in git.git (Sep 2008, #04; Mon, 29)
8
+
9
+ maint edb7e82 (Merge branch 'bc/maint-diff-hunk-header-fix' into maint)
10
+ master 9800c0d (Merge branch 'bc/master-diff-hunk-header-fix')
11
+------------------------------------------------------------------------
12
+
13
+With Junio offline for another week we won't see a 1.6.0.3 until
14
+probably mid-October. With that in mind I've merged a number of
15
+topics and trivial patches to maint so we can shake these out
16
+before the 1.6.0.3 release.
17
+
18
+* The 'maint' branch has these fixes since the last announcement.
19
+
20
+Alex Riesen (3):
21
+ Remove empty directories in recursive merge
22
+ Add remove_path: a function to remove as much as possible of a path
23
+ Use remove_path from dir.c instead of own implementation
24
+
25
+Brandon Casey (5):
26
+ diff.c: return pattern entry pointer rather than just the hunk header
27
+ pattern
28
+ diff.c: associate a flag with each pattern and use it for compiling regex
29
+ diff.*.xfuncname which uses "extended" regex's for hunk header selection
30
+ t4018-diff-funcname: test syntax of builtin xfuncname patterns
31
+ git-stash.sh: don't default to refs/stash if invalid ref supplied
32
+
33
+Chris Frey (1):
34
+ Documentation: clarify the details of overriding LESS via core.pager
35
+
36
+Deskin Miller (1):
37
+ maint: check return of split_cmdline to avoid bad config strings
38
+
39
+Johan Herland (2):
40
+ for-each-ref: Fix --format=%(subject) for log message without newlines
41
+ Use strchrnul() instead of strchr() plus manual workaround
42
+
43
+Jonas Fonseca (1):
44
+ checkout: Do not show local changes when in quiet mode
45
+
46
+Junio C Hamano (2):
47
+ diff: use extended regexp to find hunk headers
48
+ diff hunk pattern: fix misconverted "\{" tex macro introducers
49
+
50
+Michael J Gruber (1):
51
+ make "git remote" report multiple URLs
52
+
53
+Ping Yin (1):
54
+ git-submodule: Fix "Unable to checkout" for the initial 'update'
55
+
56
+Rafael Garcia-Suarez (1):
57
+ Clarify commit error message for unmerged files
58
+
59
+Shawn O. Pearce (1):
60
+ Update release notes for 1.6.0.3
61
+
62
+Stephen Haberman (1):
63
+ Clarify how the user can satisfy stash's 'dirty state' check.
64
+
65
+
66
+* The 'master' branch has these since the last announcement
67
+ in addition to the above.
68
+
69
+Alex Riesen (1):
70
+ Cleanup remove_path
71
+
72
+Alexander Gavrilov (9):
73
+ git-gui: Fix Blame Parent & Context for working copy lines.
74
+ git-gui: Restore ability to Stage Working Copy for conflicts.
75
+ git-gui: Add more integration options to citool.
76
+ git-gui: Cleanup handling of the default encoding.
77
+ git-gui: Add a menu of available encodings.
78
+ git-gui: Allow forcing display encoding for diffs using a submenu.
79
+ git-gui: Optimize encoding name resolution using a lookup table.
80
+ git-gui: Support the encoding menu in gui blame.
81
+ git-gui: Reenable staging unmerged files by clicking the icon.
82
+
83
+Anders Melchiorsen (2):
84
+ wt-status: Split header generation into three functions
85
+ wt-status: Teach how to discard changes in the working directory
86
+
87
+Brandon Casey (1):
88
+ t4018-diff-funcname: test syntax of builtin xfuncname patterns
89
+
90
+Christian Stimming (2):
91
+ git-gui: I18n fix sentence parts into full sentences for translation
92
+ again.
93
+ git-gui: Updated German translation.
94
+
95
+Dmitry Potapov (1):
96
+ mingw: remove use of _getdrive() from lstat/fstat
97
+
98
+Garry Dolley (1):
99
+ Fixed some grammatical errors in git-rebase.txt documentation.
100
+
101
+Giuseppe Bilotta (1):
102
+ gitweb: shortlog now also obeys $hash_parent
103
+
104
+Heikki Orsila (1):
105
+ diff --dirstat-by-file: count changed files, not lines
106
+
107
+Johan Herland (2):
108
+ Fix AsciiDoc errors in merge documentation
109
+ Fix submodule sync with relative submodule URLs
110
+
111
+Johannes Sixt (1):
112
+ compat/mingw: Support a timeout in the poll emulation if no fds are given
113
+
114
+Joshua Williams (1):
115
+ git-gui: Add support for calling out to the prepare-commit-msg hook
116
+
117
+Junio C Hamano (21):
118
+ checkout -f: allow ignoring unmerged paths when checking out of the index
119
+ checkout --ours/--theirs: allow checking out one side of a conflicting
120
+ merge
121
+ xdl_fill_merge_buffer(): separate out a too deeply nested function
122
+ xdiff-merge: optionally show conflicts in "diff3 -m" style
123
+ xmerge.c: minimum readability fixups
124
+ xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
125
+ rerere.c: use symbolic constants to keep track of parsing states
126
+ rerere: understand "diff3 -m" style conflicts with the original
127
+ merge.conflictstyle: choose between "merge" and "diff3 -m" styles
128
+ git-merge-recursive: learn to honor merge.conflictstyle
129
+ checkout -m: recreate merge when checking out of unmerged index
130
+ checkout --conflict=<style>: recreate merge in a non-default style
131
+ git-merge documentation: describe how conflict is presented
132
+ safe_create_leading_directories(): make it about "leading" directories
133
+ git-apply:--include=pathspec
134
+ is_directory(): a generic helper function
135
+ receive-pack: make it a builtin
136
+ push: prepare sender to receive extended ref information from the
137
+ receiver
138
+ push: receiver end advertises refs from alternate repositories
139
+ diff: use extended regexp to find hunk headers
140
+ diff: fix "multiple regexp" semantics to find hunk header comment
141
+
142
+Miklos Vajna (13):
143
+ Split out merge_recursive() to merge-recursive.c
144
+ merge-recursive: introduce merge_options
145
+ builtin-merge: avoid run_command_v_opt() for recursive and subtree
146
+ cherry-pick/revert: make direct internal call to merge_tree()
147
+ merge-recursive: move call_depth to struct merge_options
148
+ merge-recursive: get rid of the index_only global variable
149
+ merge-recursive: move the global obuf to struct merge_options
150
+ merge-recursive: move current_{file,directory}_set to struct
151
+ merge_options
152
+ merge-recursive: get rid of virtual_id
153
+ builtin-merge: release the lockfile in try_merge_strategy()
154
+ commit_tree(): add a new author parameter
155
+ builtin-commit: use commit_tree()
156
+ t7603: add new testcases to ensure builtin-commit uses reduce_heads()
157
+
158
+Nanako Shiraishi (4):
159
+ remote.c: make free_ref(), parse_push_refspec() and free_refspecs()
160
+ static.
161
+ graph.c: make many functions static
162
+ usage.c: remove unused functions
163
+ Add contrib/rerere-train script
164
+
165
+Petr Baudis (1):
166
+ git-web--browse: Support for using /bin/start on MinGW
167
+
168
+Pieter de Bie (1):
169
+ git wrapper: also use aliases to correct mistyped commands
170
+
171
+Shawn O. Pearce (3):
172
+ git-gui: Hide commit related UI during citool --nocommit
173
+ git-gui: Use gitattribute "encoding" for file content display
174
+ git-gui: Assume `blame --incremental` output is in UTF-8
175
+
176
+Stephan Beyer (1):
177
+ merge-recursive.c: Add more generic merge_recursive_generic()
178
+