1 Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29)
2 X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1
3 X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458
5 What's cooking in git.git (Sep 2008, #05; Mon, 29)
6 --------------------------------------------------
8 Here are the topics that have been cooking. Commits prefixed
9 with '-' are only in 'pu' while commits prefixed with '+' are
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.
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.
20 ----------------------------------------------------------------
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
29 This series just came in today. I haven't had a chance to look at
30 it beyond stashing in `pu`.
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
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.
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
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.
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
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.
61 * mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit
62 - make prune report removed objects on -v
64 Just came in today. Looks sane. I'll drop it onto `next` tomorrow.
66 ----------------------------------------------------------------
67 [Graduated to "master"]
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
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
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
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"
96 * jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
97 + git-apply:--include=pathspec
101 * mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
102 + t7603: add new testcases to ensure builtin-commit uses
104 + builtin-commit: use commit_tree()
105 + commit_tree(): add a new author parameter
109 * pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
110 + git wrapper: also use aliases to correct mistyped commands
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-
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
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
132 + checkout -f: allow ignoring unmerged paths when checking out of
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
141 + receive-pack: make it a builtin
142 + is_directory(): a generic helper function
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-
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-
154 + diff: use extended regexp to find hunk headers
155 + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
157 + diff.*.xfuncname which uses "extended" regex's for hunk header
159 + diff.c: associate a flag with each pattern and use it for
161 + diff.c: return pattern entry pointer rather than just the hunk
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
172 * mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
173 + make "git remote" report multiple URLs
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
182 + diff.c: associate a flag with each pattern and use it for
184 + diff.c: return pattern entry pointer rather than just the hunk
189 ----------------------------------------------------------------
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
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
201 - update-index: refactor mark_valid() in preparation for new options
202 - Introduce CE_NO_CHECKOUT bit
203 - Extend index to save more flags
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.]
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.
213 ----------------------------------------------------------------
214 [Stalled -- Needs Action to Proceed (or to be dropped)]
216 * pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
217 - t7400: Add short "git submodule add" testsuite
219 [jc: Waiting for a reroll.]
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
228 [jc: RĂ©ne had good comments on how the callback should be
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
234 [jc: I think this is still buggy and drops the option when am stops
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.
241 ----------------------------------------------------------------
242 [Will be merged to 'master/maint' soon]
244 * jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit
245 + git-add --intent-to-add (-N)
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.]
250 I'm inclined to merge this next week.
254 ----------------------------------------------------------------
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
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
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.
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
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).]
278 Agree with Junio. Hence its still here.
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
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.
288 ----------------------------------------------------------------
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
295 [jc: I started making this incremental but the progress is not so great.]
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:
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
306 [jc: The one at second from the tip needs reworking.]
308 * jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
309 - "git push": tellme-more protocol extension
311 * jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit
312 . WIP: start teaching the --whitespace=fix to merge machinery
314 This has a merge conflict with `next` and isn't even in pu right now.
316 * jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
317 - blame: show "previous" information in --porcelain/--incremental
319 - git-blame: refactor code to emit "porcelain format" output
321 I should look at this in more detail. We may be able to merge it
324 * sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
325 + merge: remove deprecated summary and diffstat options and config
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.]
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
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