@matheusbsbs / matheus-bagliano / commits / c8c4b34bb2

What's cooking (2011/09 #02)

Junio C Hamano committed Sep 6, 2011 at 16:41 UTC c8c4b34bb2a9d71ca32e5b4217e229c00acd9fef
1 file changed +115 -382
whats-cooking.txt
+115 -382
@@ -1,9 +1,9 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Sep 2011, #01; Fri, 2)
3 -X-master-at: b32128793de296348a565e8f7c4257ec82208a48
4 -X-next-at: be4d2450c3dc8f2570ac5b51987d355b67eef11a
2 +Subject: What's cooking in git.git (Sep 2011, #02; Tue, 6)
3 +X-master-at: 50963badbcfe2693d7a51ace3079c6b48ec52f01
4 +X-next-at: 7931f38a2fd882b0f75a4d6f0eb60c3b1b094178
5
6 -What's cooking in git.git (Sep 2011, #01; Fri, 2)
6 +What's cooking in git.git (Sep 2011, #02; Tue, 6)
7 --------------------------------------------------
8
9 Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -15,14 +15,120 @@ patches for new features and fixes to longstanding issues will stay in
15 'pu' or 'next' until the 1.7.7 final.
16
17 --------------------------------------------------
18 -[New Topics]
18 +[Graduated to "master"]
19 +
20 +* cb/maint-ls-files-error-report (2011-08-28) 1 commit
21 + (merged to 'next' on 2011-08-30 at b606e19)
22 + + t3005: do not assume a particular order of stdout and stderr of git-ls-files
23
24 * mh/check-ref-format-print-normalize (2011-08-27) 2 commits
25 (merged to 'next' on 2011-08-30 at e827410)
26 + Forbid DEL characters in reference names
27 + check-ref-format --print: Normalize refnames that start with slashes
28
25 -Will merge to "master".
29 +* rc/histogram-diff (2011-08-31) 1 commit
30 + (merged to 'next' on 2011-09-02 at be4d245)
31 + + xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
32 +
33 +--------------------------------------------------
34 +[New Topics]
35 +
36 +* cb/common-prefix-unification (2011-09-06) 3 commits
37 + - rename pathspec_prefix() to common_prefix() and move to dir.[ch]
38 + - consolidate pathspec_prefix and common_prefix
39 + - remove prefix argument from pathspec_prefix
40 +
41 +* cb/maint-quiet-push (2011-09-05) 4 commits
42 + . t5541: avoid TAP test miscounting
43 + . push: old receive-pack does not understand --quiet
44 + . fix push --quiet via http
45 + . tests for push --quiet
46 +
47 +Dropped for rerolling after 1.7.7 cycle.
48 +
49 +* cb/send-email-help (2011-09-05) 1 commit
50 + - send-email: add option -h
51 +
52 +* jc/fetch-pack-fsck-objects (2011-09-04) 3 commits
53 + - test: fetch/receive with fsckobjects
54 + - transfer.fsckobjects: unify fetch/receive.fsckobjects
55 + - fetch.fsckobjects: verify downloaded objects
56 +
57 +* jc/receive-verify (2011-09-02) 3 commits
58 + - receive-pack: check connectivity before concluding "git push"
59 + - check_everything_connected(): libify
60 + - check_everything_connected(): refactor to use an iterator
61 + (this branch uses jc/fetch-verify, jc/fetch-verify and jc/traverse-commit-list.)
62 +
63 +* tr/doc-note-rewrite (2011-09-05) 1 commit
64 + - Documentation: "on for all" configuration of notes.rewriteRef
65 +
66 +* jc/request-pull-show-head (2011-09-06) 1 commit
67 + - State what commit to expect in request-pull
68 +
69 +* jn/maint-http-error-message (2011-09-06) 2 commits
70 + - http: avoid empty error messages for some curl errors
71 + - http: remove extra newline in error message
72 +
73 +--------------------------------------------------
74 +[Stalled]
75 +
76 +* jk/add-i-hunk-filter (2011-07-27) 5 commits
77 + (merged to 'next' on 2011-08-11 at 8ff9a56)
78 + + add--interactive: add option to autosplit hunks
79 + + add--interactive: allow negatation of hunk filters
80 + + add--interactive: allow hunk filtering on command line
81 + + add--interactive: factor out regex error handling
82 + + add--interactive: refactor patch mode argument processing
83 +
84 +Needs documentation updates, tests, and integration with the higher level
85 +callers, e.g. "git add -p".
86 +
87 +* jh/receive-count-limit (2011-05-23) 10 commits
88 + - receive-pack: Allow server to refuse pushes with too many objects
89 + - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
90 + - send-pack/receive-pack: Allow server to refuse pushing too large packs
91 + - pack-objects: Allow --max-pack-size to be used together with --stdout
92 + - send-pack/receive-pack: Allow server to refuse pushes with too many commits
93 + - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
94 + - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
95 + - Tighten rules for matching server capabilities in server_supports()
96 + - send-pack: Attempt to retrieve remote status even if pack-objects fails
97 + - Update technical docs to reflect side-band-64k capability in receive-pack
98 +
99 +Would need another round to separate per-pack and per-session limits.
100 +
101 +* jm/mergetool-pathspec (2011-06-22) 2 commits
102 + - mergetool: Don't assume paths are unmerged
103 + - mergetool: Add tests for filename with whitespace
104 +
105 +I think this is a good idea, but it probably needs a re-roll.
106 +Cf. $gmane/176254, 176255, 166256
107 +
108 +* jk/generation-numbers (2011-07-14) 7 commits
109 + - limit "contains" traversals based on commit generation
110 + - check commit generation cache validity against grafts
111 + - pretty: support %G to show the generation number of a commit
112 + - commit: add commit_generation function
113 + - add metadata-cache infrastructure
114 + - decorate: allow storing values instead of pointers
115 + - Merge branch 'jk/tag-contains-ab' (early part) into HEAD
116 +
117 +The initial "tag --contains" de-pessimization without need for generation
118 +numbers is already in; backburnered.
119 +
120 +* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
121 + - t5800: point out that deleting branches does not work
122 + - t5800: document inability to push new branch with old content
123 +
124 +* po/cygwin-backslash (2011-08-05) 2 commits
125 + - On Cygwin support both UNIX and DOS style path-names
126 + - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
127 +
128 +I think a further refactoring (no, not my suggestion) was offered?
129 +
130 +--------------------------------------------------
131 +[Cooking]
132
133 * bk/ancestry-path (2011-08-25) 3 commits
134 (merged to 'next' on 2011-09-02 at d05ba5d)
@@ -89,12 +195,6 @@ Not urgent; will not be in 1.7.7.
195
196 Not urgent; the topic came up a bit too late in the cycle.
197
92 -* cb/maint-ls-files-error-report (2011-08-28) 1 commit
93 - (merged to 'next' on 2011-08-30 at b606e19)
94 - + t3005: do not assume a particular order of stdout and stderr of git-ls-files
95 -
96 -Will merge to "master".
97 -
198 * da/make-auto-header-dependencies (2011-08-30) 1 commit
199 (merged to 'next' on 2011-09-02 at e04a4af)
200 + Makefile: Improve compiler header dependency check
@@ -143,390 +243,23 @@ Not urgent; the topic came up a bit too late in the cycle.
243 What the topic aims to achieve may make sense, but the implementation
244 looked somewhat suboptimal.
245
146 -* jc/fetch-verify (2011-09-01) 4 commits
147 - - NEEDSWORK: rev-list --verify-objects: run fsck_objects() on all objects listed
246 +* jc/fetch-verify (2011-09-01) 3 commits
247 - fetch: verify we have everything we need before updating our ref
248 - rev-list --verify-object
249 - list-objects: pass callback data to show_objects()
151 - (this branch uses jc/traverse-commit-list.)
250 + (this branch is used by jc/receive-verify and jc/receive-verify; uses jc/traverse-commit-list.)
251
252 Make "git fetch" verify what it received a bit more carefully before
253 updating the refs in the receiving end.
254
255 Not urgent; the topic came up a bit too late in the cycle.
256
158 -* rc/histogram-diff (2011-08-31) 1 commit
159 - (merged to 'next' on 2011-09-02 at be4d245)
160 - + xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
161 -
162 -Will merge to "master".
163 -
164 ---------------------------------------------------
165 -[Graduated to "master"]
166 -
167 -* ac/describe-dirty-refresh (2011-08-11) 1 commit
168 - (merged to 'next' on 2011-08-23 at b873611)
169 - + describe: Refresh the index when run with --dirty
170 -
171 -* bc/bisect-test-use-shell-path (2011-08-30) 1 commit
172 - (merged to 'next' on 2011-08-30 at c090151)
173 - + t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
174 -
175 -* bg/t5540-osx-grep (2011-08-28) 1 commit
176 - (merged to 'next' on 2011-08-30 at 894af05)
177 - + t5540-http-test: shorten grep pattern
178 -
179 -* bw/doc-repo-layout (2011-08-23) 2 commits
180 - (merged to 'next' on 2011-08-24 at 605c730)
181 - + Mark http-fetch without -a as deprecated
182 - + Documentation: Grammar correction, wording fixes and cleanup
183 -
184 -* ci/forbid-unwanted-current-branch-update (2011-08-22) 2 commits
185 - (merged to 'next' on 2011-08-24 at 1e93b67)
186 - + Show interpreted branch name in error messages
187 - + Prevent force-updating of the current branch
188 -
189 -* da/difftool-mergtool-refactor (2011-08-19) 4 commits
190 - (merged to 'next' on 2011-08-23 at a1cc3be)
191 - + mergetools/meld: Use '--output' when available
192 - + mergetool--lib: Refactor tools into separate files
193 - + mergetool--lib: Make style consistent with git
194 - + difftool--helper: Make style consistent with git
195 -
196 -* di/fast-import-blob-tweak (2011-08-22) 2 commits
197 - (merged to 'next' on 2011-08-24 at 52eef2a)
198 - + fast-import: treat cat-blob as a delta base hint for next blob
199 - + fast-import: count and report # of calls to diff_delta in stats
200 -
201 -* di/fast-import-deltified-tree (2011-08-14) 2 commits
202 - (merged to 'next' on 2011-08-23 at ee30265)
203 - + fast-import: prevent producing bad delta
204 - + fast-import: add a test for tree delta base corruption
205 -
206 -* di/fast-import-doc (2011-08-17) 1 commit
207 - (merged to 'next' on 2011-08-23 at dab4088)
208 - + doc/fast-import: document feature import-marks-if-exists
209 -
210 -* di/fast-import-ident (2011-08-11) 5 commits
211 - (merged to 'next' on 2011-08-23 at 9b86391)
212 - + fsck: improve committer/author check
213 - + fsck: add a few committer name tests
214 - + fast-import: check committer name more strictly
215 - + fast-import: don't fail on omitted committer name
216 - + fast-import: add input format tests
217 -
218 -* di/fast-import-tagging (2011-08-23) 2 commits
219 - (merged to 'next' on 2011-08-24 at 67e0937)
220 - + fast-import: allow to tag newly created objects
221 - + fast-import: add tests for tagging blobs
222 -
223 -* di/parse-options-split (2011-08-11) 2 commits
224 - (merged to 'next' on 2011-08-23 at 6cd667f)
225 - + Reduce parse-options.o dependencies
226 - + parse-options: export opterr, optbug
227 -
228 -* en/merge-recursive-2 (2011-08-14) 57 commits
229 - (merged to 'next' on 2011-08-23 at ba6ad0d)
230 - + merge-recursive: Don't re-sort a list whose order we depend upon
231 - + merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
232 - + t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
233 - + merge-recursive: Avoid unnecessary file rewrites
234 - + t6022: Additional tests checking for unnecessary updates of files
235 - + merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
236 - + t6022: Add testcase for spurious "refusing to lose untracked" messages
237 - + t3030: fix accidental success in symlink rename
238 - + merge-recursive: Fix working copy handling for rename/rename/add/add
239 - + merge-recursive: add handling for rename/rename/add-dest/add-dest
240 - + merge-recursive: Have conflict_rename_delete reuse modify/delete code
241 - + merge-recursive: Make modify/delete handling code reusable
242 - + merge-recursive: Consider modifications in rename/rename(2to1) conflicts
243 - + merge-recursive: Create function for merging with branchname:file markers
244 - + merge-recursive: Record more data needed for merging with dual renames
245 - + merge-recursive: Defer rename/rename(2to1) handling until process_entry
246 - + merge-recursive: Small cleanups for conflict_rename_rename_1to2
247 - + merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
248 - + merge-recursive: Introduce a merge_file convenience function
249 - + merge-recursive: Fix modify/delete resolution in the recursive case
250 - + merge-recursive: When we detect we can skip an update, actually skip it
251 - + merge-recursive: Provide more info in conflict markers with file renames
252 - + merge-recursive: Cleanup and consolidation of rename_conflict_info
253 - + merge-recursive: Consolidate process_entry() and process_df_entry()
254 - + merge-recursive: Improve handling of rename target vs. directory addition
255 - + merge-recursive: Add comments about handling rename/add-source cases
256 - + merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
257 - + merge-recursive: Fix deletion of untracked file in rename/delete conflicts
258 - + merge-recursive: Split update_stages_and_entry; only update stages at end
259 - + merge-recursive: Allow make_room_for_path() to remove D/F entries
260 - + string-list: Add API to remove an item from an unsorted list
261 - + merge-recursive: Split was_tracked() out of would_lose_untracked()
262 - + merge-recursive: Save D/F conflict filenames instead of unlinking them
263 - + merge-recursive: Fix code checking for D/F conflicts still being present
264 - + merge-recursive: Fix sorting order and directory change assumptions
265 - + merge-recursive: Fix recursive case with D/F conflict via add/add conflict
266 - + merge-recursive: Avoid working directory changes during recursive case
267 - + merge-recursive: Remember to free generated unique path names
268 - + merge-recursive: Consolidate different update_stages functions
269 - + merge-recursive: Mark some diff_filespec struct arguments const
270 - + merge-recursive: Correct a comment
271 - + merge-recursive: Make BUG message more legible by adding a newline
272 - + t6022: Add testcase for merging a renamed file with a simple change
273 - + t6022: New tests checking for unnecessary updates of files
274 - + t6022: Remove unnecessary untracked files to make test cleaner
275 - + t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
276 - + t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
277 - + t6036: tests for criss-cross merges with various directory/file conflicts
278 - + t6036: criss-cross with weird content can fool git into clean merge
279 - + t6036: Add differently resolved modify/delete conflict in criss-cross test
280 - + t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
281 - + t6042: Ensure rename/rename conflicts leave index and workdir in sane state
282 - + t6042: Add tests for content issues with modify/rename/directory conflicts
283 - + t6042: Add a testcase where undetected rename causes silent file deletion
284 - + t6042: Add a pair of cases where undetected renames cause issues
285 - + t6042: Add failing testcase for rename/modify/add-source conflict
286 - + t6042: Add a testcase where git deletes an untracked file
287 -
288 -I've taken advantage of the end-of-summer lull and reproduced all 16000+
289 -two-head merges in the Linux kernel repository with and without this
290 -series to make sure they get the identical results (either cleanly merged,
291 -or getting conflicted the same way).
292 -
293 -* fg/submodule-ff-check-before-push (2011-08-20) 2 commits
294 - (merged to 'next' on 2011-08-24 at 398e764)
295 - + push: Don't push a repository with unpushed submodules
296 - (this branch is used by hv/submodule-merge-search.)
297 -
298 -This is only the "check" part, which was sensible. The "auto-push" patch
299 -has been moved to its own topic.
300 -
301 -* fk/use-kwset-pickaxe-grep-f (2011-08-28) 6 commits
302 - (merged to 'next' on 2011-08-28 at 3be2039)
303 - + obstack: Fix portability issues
304 - (merged to 'next' on 2011-08-23 at 93ba509)
305 - + Use kwset in grep
306 - + Use kwset in pickaxe
307 - + Adapt the kwset code to Git
308 - + Add string search routines from GNU grep
309 - + Add obstack.[ch] from EGLIBC 2.10
310 -
311 -* gb/maint-am-patch-format-error-message (2011-08-29) 1 commit
312 - (merged to 'next' on 2011-08-30 at ed01a1d)
313 - + am: format is in $patch_format, not parse_patch
314 -
315 -* gb/maint-am-stgit-author-to-from-fix (2011-08-29) 1 commit
316 - (merged to 'next' on 2011-08-30 at 0740010)
317 - + am: fix stgit patch mangling
318 -
319 -* jc/clean-exclude-doc (2011-08-28) 1 commit
320 - (merged to 'next' on 2011-08-30 at 79dd173)
321 - + Documentation: clarify "git clean -e <pattern>"
322 -
323 -* jc/combine-diff-callback (2011-08-20) 1 commit
324 - (merged to 'next' on 2011-08-24 at 9f9b42d)
325 - + combine-diff: support format_callback
326 - (this branch is used by fg/submodule-ff-check-before-push and hv/submodule-merge-search.)
327 -
328 -* jc/maint-autofix-tag-in-head (2011-08-19) 1 commit
329 - (merged to 'next' on 2011-08-23 at 18cee02)
330 - + commit: reduce use of redundant global variables
331 -
332 -* jc/maint-clone-alternates (2011-08-23) 2 commits
333 - (merged to 'next' on 2011-08-23 at 7280deb)
334 - + clone: clone from a repository with relative alternates
335 - + clone: allow more than one --reference
336 -
337 -* jc/merge-reword (2011-05-25) 1 commit
338 - (merged to 'next' on 2011-08-24 at aa5cf7b)
339 - + merge: reword the final message
340 -
341 -* jk/color-and-pager (2011-08-19) 10 commits
342 - (merged to 'next' on 2011-08-23 at cbb9495)
343 - + want_color: automatically fallback to color.ui
344 - + diff: don't load color config in plumbing
345 - + config: refactor get_colorbool function
346 - + color: delay auto-color decision until point of use
347 - + git_config_colorbool: refactor stdout_is_tty handling
348 - + diff: refactor COLOR_DIFF from a flag into an int
349 - + setup_pager: set GIT_PAGER_IN_USE
350 - + t7006: use test_config helpers
351 - + test-lib: add helper functions for config
352 - + t7006: modernize calls to unset
353 - (this branch is used by jk/pager-with-alias and jk/pager-with-external-command.)
354 -
355 -* jk/pager-with-external-command (2011-08-19) 1 commit
356 - (merged to 'next' on 2011-08-24 at 083f5da)
357 - + support pager.* for external commands
358 - (this branch is used by jk/pager-with-alias and jk/pager-with-alias; uses jk/color-and-pager.)
359 -
360 -* jn/plug-empty-tree-leak (2011-08-16) 2 commits
361 - (merged to 'next' on 2011-08-23 at aee2184)
362 - + merge-recursive: take advantage of hardcoded empty tree
363 - + revert: plug memory leak in "cherry-pick root commit" codepath
364 -
365 -* js/i18n-scripts (2011-08-08) 5 commits
366 - (merged to 'next' on 2011-08-23 at a1b5529)
367 - + submodule: take advantage of gettextln and eval_gettextln.
368 - + stash: take advantage of eval_gettextln
369 - + pull: take advantage of eval_gettextln
370 - + git-am: take advantage of gettextln and eval_gettextln.
371 - + gettext: add gettextln, eval_gettextln to encode common idiom
372 -
373 -* js/i18n-scripts-2 (2011-08-30) 1 commit
374 - (merged to 'next' on 2011-08-30 at 5a144a2)
375 - + bisect: take advantage of gettextln, eval_gettextln.
376 -
377 -* mg/branch-set-upstream-previous (2011-08-19) 1 commit
378 - (merged to 'next' on 2011-08-23 at acef0b6)
379 - + branch.c: use the parsed branch name
380 -
381 -* mg/maint-notes-C-doc (2011-08-25) 1 commit
382 - (merged to 'next' on 2011-08-30 at 6f3281a)
383 - + git-notes.txt: clarify -C vs. copy and -F
384 -
385 -* mh/attr (2011-08-14) 7 commits
386 - (merged to 'next' on 2011-08-23 at 22faa6e)
387 - + Unroll the loop over passes
388 - + Change while loop into for loop
389 - + Determine the start of the states outside of the pass loop
390 - + Change parse_attr() to take a pointer to struct attr_state
391 - + Increment num_attr in parse_attr_line(), not parse_attr()
392 - + Document struct match_attr
393 - + Add a file comment
394 -
395 -* ms/daemon-timeout-is-in-seconds (2011-08-28) 1 commit
396 - (merged to 'next' on 2011-08-30 at 2462eb0)
397 - + git-daemon.txt: specify --timeout in seconds
398 -
399 -* nd/decorate-grafts (2011-08-25) 6 commits
400 - (merged to 'next' on 2011-08-25 at 44967e7)
401 - + log: Do not decorate replacements with --no-replace-objects
402 - (merged to 'next' on 2011-08-23 at 475d27e)
403 - + log: decorate "replaced" on to replaced commits
404 - + log: decorate grafted commits with "grafted"
405 - + Move write_shallow_commits to fetch-pack.c
406 - + Add for_each_commit_graft() to iterate all grafts
407 - + decoration: do not mis-decorate refs with same prefix
408 -
409 -* nd/maint-clone-gitdir (2011-08-22) 2 commits
410 - (merged to 'next' on 2011-08-24 at cbf052b)
411 - + clone: allow to clone from .git file
412 - + read_gitfile_gently(): rename misnamed function to read_gitfile()
413 -
414 -* nk/branch-v-abbrev (2011-07-01) 1 commit
415 - (merged to 'next' on 2011-08-24 at e9152cf)
416 - + branch -v: honor core.abbrev
417 - (this branch is used by mg/branch-list.)
418 -
419 -* rc/diff-cleanup-records (2011-08-17) 2 commits
420 - (merged to 'next' on 2011-08-23 at b8414f5)
421 - + Merge branch 'rc/histogram-diff' into HEAD
422 - + xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
423 -
424 -* tr/maint-format-patch-empty-output (2011-08-29) 4 commits
425 - (merged to 'next' on 2011-08-30 at 078c522)
426 - + Document negated forms of format-patch --to --cc --add-headers
427 - + t4014: "no-add-headers" is actually called "no-add-header"
428 - + t4014: invoke format-patch with --stdout where intended
429 - + t4014: check for empty files from git format-patch --stdout
430 -
431 -* tr/maint-ident-to-git-memmove (2011-08-29) 1 commit
432 - (merged to 'next' on 2011-08-30 at 9395a9b)
433 - + Use memmove in ident_to_git
434 -
435 -* tr/maint-strbuf-grow-nul-termination (2011-08-29) 1 commit
436 - (merged to 'next' on 2011-08-30 at dc87192)
437 - + strbuf_grow(): maintain nul-termination even for new buffer
438 -
439 -* tr/maint-t3903-misquoted-command (2011-08-30) 1 commit
440 - (merged to 'next' on 2011-08-30 at f533857)
441 - + t3903: fix misquoted rev-parse invocation
442 -
443 -* va/p4-branch-import (2011-08-22) 4 commits
444 - (merged to 'next' on 2011-08-24 at f67f8af)
445 - + git-p4: Add simple test case for branch import
446 - + git-p4: Allow branch definition with git config
447 - + git-p4: Allow filtering Perforce branches by user
448 - + git-p4: Correct branch base depot path detection
449 - (this branch uses va/p4-rename-copy.)
450 -
451 -* va/p4-branch-import-test-update (2011-08-29) 1 commit
452 - (merged to 'next' on 2011-08-30 at 5c54fb3)
453 - + git-p4: simple branch tests edits
454 -
455 -* va/p4-rename-copy (2011-08-22) 5 commits
456 - (merged to 'next' on 2011-08-24 at f1faa94)
457 - + git-p4: Process detectCopiesHarder with --bool
458 - + git-p4: Add test case for copy detection
459 - + git-p4: Add test case for rename detection
460 - + git-p4: Add description of rename/copy detection options
461 - + git-p4: Allow setting rename/copy detection threshold
462 - (this branch is used by va/p4-branch-import.)
463 -
464 ---------------------------------------------------
465 -[Stalled]
466 -
467 -* jk/add-i-hunk-filter (2011-07-27) 5 commits
468 - (merged to 'next' on 2011-08-11 at 8ff9a56)
469 - + add--interactive: add option to autosplit hunks
470 - + add--interactive: allow negatation of hunk filters
471 - + add--interactive: allow hunk filtering on command line
472 - + add--interactive: factor out regex error handling
473 - + add--interactive: refactor patch mode argument processing
474 -
475 -Needs documentation updates, tests, and integration with the higher level
476 -callers, e.g. "git add -p".
477 -
478 -* jh/receive-count-limit (2011-05-23) 10 commits
479 - - receive-pack: Allow server to refuse pushes with too many objects
480 - - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
481 - - send-pack/receive-pack: Allow server to refuse pushing too large packs
482 - - pack-objects: Allow --max-pack-size to be used together with --stdout
483 - - send-pack/receive-pack: Allow server to refuse pushes with too many commits
484 - - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
485 - - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
486 - - Tighten rules for matching server capabilities in server_supports()
487 - - send-pack: Attempt to retrieve remote status even if pack-objects fails
488 - - Update technical docs to reflect side-band-64k capability in receive-pack
489 -
490 -Would need another round to separate per-pack and per-session limits.
491 -
492 -* jm/mergetool-pathspec (2011-06-22) 2 commits
493 - - mergetool: Don't assume paths are unmerged
494 - - mergetool: Add tests for filename with whitespace
495 -
496 -I think this is a good idea, but it probably needs a re-roll.
497 -Cf. $gmane/176254, 176255, 166256
498 -
499 -* jk/generation-numbers (2011-07-14) 7 commits
500 - - limit "contains" traversals based on commit generation
501 - - check commit generation cache validity against grafts
502 - - pretty: support %G to show the generation number of a commit
503 - - commit: add commit_generation function
504 - - add metadata-cache infrastructure
505 - - decorate: allow storing values instead of pointers
506 - - Merge branch 'jk/tag-contains-ab' (early part) into HEAD
507 -
508 -The initial "tag --contains" de-pessimization without need for generation
509 -numbers is already in; backburnered.
510 -
511 -* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
512 - - t5800: point out that deleting branches does not work
513 - - t5800: document inability to push new branch with old content
514 -
515 -* po/cygwin-backslash (2011-08-05) 2 commits
516 - - On Cygwin support both UNIX and DOS style path-names
517 - - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
518 -
519 -I think a further refactoring (no, not my suggestion) was offered?
520 -
521 ---------------------------------------------------
522 -[Cooking]
523 -
257 * jc/traverse-commit-list (2011-08-22) 3 commits
258 (merged to 'next' on 2011-08-24 at df50dd7)
259 + revision.c: update show_object_with_name() without using malloc()
260 + revision.c: add show_object_with_name() helper function
261 + rev-list: fix finish_object() call
529 - (this branch is used by jc/fetch-verify.)
262 + (this branch is used by jc/fetch-verify and jc/receive-verify.)
263
264 Not urgent; will not be in 1.7.7.
265