From 0230af77762efdec53654855a106ae52c02a9cb2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Apr 2011 15:45:08 -0700 Subject: [PATCH] What's cooking (2011/04 #06) --- whats-cooking.txt | 487 +++++++++++++++++++++++----------------------- 1 file changed, 240 insertions(+), 247 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 0f6d614806..932128dd21 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,77 +1,91 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Apr 2011, #05; Tue, 19) -X-master-at: 6ceb270ce6f65cf4bc2a22830f96e0cc838b3fec -X-next-at: 63e4ee5f87eede11d1377370c385c26c5b90c6e7 +Subject: What's cooking in git.git (Apr 2011, #06; Mon, 25) +X-master-at: ec014eac0e9e6f30cbbca616090fa2ecf74797e7 +X-next-at: 4216d33f893e8855ed345bfc97625e82433e569c -What's cooking in git.git (Apr 2011, #05; Tue, 19) +What's cooking in git.git (Apr 2011, #06; Mon, 25) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. -As we are already in pre-release feature freeze, some of the trivially -correct features and fixes to non-regression bugs are only queued to -'next' but not in 'master'. They are marked as post 1.7.5 candidates in -this list. +The main part of this cycle is expected to run thru May, aiming for a +feature freeze in early June. We are at the beginning of week #1 of this +cycle and week #2 starts on May 2nd. -------------------------------------------------- [New Topics] -* cn/log-parse-opt (2011-04-14) 1 commit - - log: convert to parse-options +* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits + - revisions: allow --glob and friends in parse_options-enabled commands + - revisions: split out handle_revision_pseudo_opt function -* rr/rerere-clear-libify (2011-04-13) 1 commit - - rerere: Expose an API corresponding to 'clear' functionality +* mg/x-years-12-months (2011-04-20) 1 commit + (merged to 'next' on 2011-04-25 at 74ba83b) + + date: avoid "X years, 12 months" in relative dates -Jonathan had good comments on moving the garbage collection interface as -well. Perhaps needs a re-roll. +Will merge to "master" by the end of week #1. -* jk/format-patch-multiline-header (2011-04-14) 1 commit - - format-patch: wrap email addresses after long names +* jc/fix-add-u-unmerged (2011-04-20) 1 commit + - Fix "add -u" that sometimes fails to resolve unmerged paths + (this branch uses jc/fix-diff-files-unmerged.) -* jn/format-patch-doc (2011-04-18) 6 commits - - Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird - - Documentation: publicize hints for sending patches with GMail - - Documentation: publicize KMail hints for sending patches inline - - Documentation: hints for sending patches inline with Thunderbird - - Documentation: explain how to check for patch corruption - - Merge v1.7.5-rc2 into jn/format-patch-doc - (this branch uses jn/maint-format-patch-doc.) +* jc/fix-diff-files-unmerged (2011-04-22) 4 commits + - diff-files: show unmerged entries correctly + - diff: remove often unused parameters from diff_unmerge() + - diff.c: return filepair from diff_unmerge() + - test: use $_z40 from test-lib + (this branch is used by jc/fix-add-u-unmerged.) -* jn/gitweb-js (2011-04-15) 13 commits - - gitweb: Make JavaScript ability to adjust timezones configurable - - gitweb.js: Add UI for selecting common timezone to display dates - - gitweb: JavaScript ability to adjust time based on timezone - - gitweb: Unify the way long timestamp is displayed - - gitweb: Refactor generating of long dates into format_timestamp_html - - gitweb.js: Provide getElementsByClassName method (if it not exists) - - gitweb.js: Introduce gitweb/static/js/lib/cookies.js - - gitweb.js: Extract and improve datetime handling - - gitweb.js: Provide default values for padding in padLeftStr and padLeft - - gitweb.js: Update and improve comments in JavaScript files - - gitweb: Split JavaScript for maintability, combining on build - - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile - - git-instaweb: Simplify build dependency on gitweb +* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit + - send-pack: avoid deadlock when pack-object dies early + (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.) -* jn/maint-format-patch-doc (2011-04-14) 1 commit - - Documentation: describe the format of messages with inline patches - (this branch is used by jn/format-patch-doc.) +* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit + - Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix + (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.) -* jn/run-command-error-failure (2011-04-19) 1 commit - - run-command: write full error message in die_child +* vh/git-svn-doc (2011-04-25) 1 commit + - git-svn.txt: fix usage of --add-author-from -* ss/cherry-pick-x-doc (2011-04-15) 1 commit - - doc: Clarify that "cherry-pick -x" does not use "git notes" +-------------------------------------------------- +[Stalled] -* ss/doc-svn (2011-04-19) 1 commit - - remove noise and inaccuracies from git-svn docs +* jk/maint-merge-rename-create (2011-03-25) 3 commits + - merge: turn on rewrite detection + - merge: handle renames with replacement content + - t3030: fix accidental success in symlink rename -* vr/merge-base-doc (2011-04-15) 2 commits - - Restructure documentation for git-merge-base. - - Documentation: update to git-merge-base --octopus +Peff wanted to reroll this, so this is taken out of "next". --------------------------------------------------- -[Stalled] +* dm/http-cleanup (2011-03-30) 2 commits + - http-push: refactor curl_easy_setup madness + - http: make curl callbacks match contracts from curl header + +I didn't see anything glaringly wrong with this, but I would appreciate +extra sets of eyeballs from people who have worked on HTTP transports to +double check. + +* jk/maint-push-async-hang (2011-03-31) 4 commits + - send-pack: abort sideband demuxer on pack-objects error + - run-command: allow aborting async code prematurely + - finish_async: be quiet when waiting for async process + - teach wait_or_whine a "quiet" mode + (this branch is used by jk/maint-push-async-hang-threads.) + +* jk/maint-push-async-hang-threads (2011-03-31) 2 commits + - run-command: implement abort_async for pthreads + - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads + (this branch uses jk/maint-push-async-hang.) + +These two series aim for a good goal, but needs reroll after 1.7.5 with +sign-offs. + +* rr/rerere-clear-libify (2011-04-13) 1 commit + - rerere: Expose an API corresponding to 'clear' functionality + +Jonathan had good comments on moving the garbage collection interface as +well. Perhaps needs a re-roll. * jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits - "add -p": work-around an old laziness that does not coalesce hunks @@ -84,7 +98,8 @@ we may want to add tests before moving it forward. - builtin/show: do not prune by pathspec (this branch uses mg/reflog-with-options.) -I wanted to like this, but it still feels like too much magic. +I wanted to like this, but it still feels like too much magic. Will drop +and wait for the topic to resurface. * gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit - Look for password in both CVS and CVSNT password files. @@ -99,8 +114,8 @@ to regress the users of the original cvs. - write_idx_file: introduce a struct to hold idx customization options - index-pack: group the delta-base array entries also by type -Still a WIP, and will not be ready for 1.7.5. Need to put histogram output -into index-pack --verify to really kill verify-pack. +Still a WIP. Need to put histogram output into index-pack --verify to +really kill verify-pack. * jk/tag-contains (2010-07-05) 4 commits - Why is "git tag --contains" so slow? @@ -116,234 +131,245 @@ current usage context. -------------------------------------------------- [Cooking] +* cn/log-parse-opt (2011-04-14) 1 commit + - log: convert to parse-options + +* jk/format-patch-multiline-header (2011-04-14) 1 commit + - format-patch: wrap email addresses after long names + +Will merge to "next". + +* jn/maint-format-patch-doc (2011-04-14) 1 commit + - Documentation: describe the format of messages with inline patches + (this branch is used by jn/format-patch-doc.) + +Will merge to "next". + +* jn/format-patch-doc (2011-04-18) 6 commits + - Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird + - Documentation: publicize hints for sending patches with GMail + - Documentation: publicize KMail hints for sending patches inline + - Documentation: hints for sending patches inline with Thunderbird + - Documentation: explain how to check for patch corruption + - Merge v1.7.5-rc2 into jn/format-patch-doc + (this branch uses jn/maint-format-patch-doc.) + +Will merge to "next". + +* jn/gitweb-js (2011-04-15) 13 commits + - gitweb: Make JavaScript ability to adjust timezones configurable + - gitweb.js: Add UI for selecting common timezone to display dates + - gitweb: JavaScript ability to adjust time based on timezone + - gitweb: Unify the way long timestamp is displayed + - gitweb: Refactor generating of long dates into format_timestamp_html + - gitweb.js: Provide getElementsByClassName method (if it not exists) + - gitweb.js: Introduce gitweb/static/js/lib/cookies.js + - gitweb.js: Extract and improve datetime handling + - gitweb.js: Provide default values for padding in padLeftStr and padLeft + - gitweb.js: Update and improve comments in JavaScript files + - gitweb: Split JavaScript for maintability, combining on build + - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile + - git-instaweb: Simplify build dependency on gitweb + +* jn/run-command-error-failure (2011-04-20) 2 commits + - run-command: handle short writes and EINTR in die_child + - tests: check error message from run_command + +Will merge to "next". + +* ss/cherry-pick-x-doc (2011-04-15) 1 commit + - doc: Clarify that "cherry-pick -x" does not use "git notes" + +Will merge to "next". + +* ss/doc-svn (2011-04-19) 1 commit + - remove noise and inaccuracies from git-svn docs + +Will merge to "next". + +* vr/merge-base-doc (2011-04-15) 2 commits + - Restructure documentation for git-merge-base. + - Documentation: update to git-merge-base --octopus + +Will merge to "next". + * ef/maint-strbuf-init (2011-04-10) 2 commits - (merged to 'next' on 2011-04-11 at 1dd34d9) + (merged to 'next' on 2011-04-25 at 6a45422) + config: support values longer than 1023 bytes + strbuf: make sure buffer is zero-terminated -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -release. +Will merge to "master" by the end of week #1. * jh/dirstat (2011-04-12) 4 commits - (merged to 'next' on 2011-04-12 at dd2c308) + (merged to 'next' on 2011-04-25 at cb277e6) + --dirstat: In case of renames, use target filename instead of source filename - (merged to 'next' on 2011-04-11 at 33d0417) + Teach --dirstat not to completely ignore rearranged lines within a file + --dirstat-by-file: Make it faster and more correct + --dirstat: Describe non-obvious differences relative to --stat or regular diff -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -releases. +Will merge to "master" by the end of week #1. * jm/mergetool-submodules (2011-04-13) 1 commit - mergetool: Teach about submodules -Looked sane if inefficient when both branches have the submodule but was -dubious in delete/modify conflict case. Awaiting response and possibly a -reroll. +Will merge to "next". * rj/sparse (2011-04-07) 7 commits - - sparse: Fix some "symbol not declared" warnings - - sparse: Fix errors due to missing target-specific variables - - sparse: Fix an "symbol 'merge_file' not decared" warning - - sparse: Fix an "symbol 'format_subject' not declared" warning - - sparse: Fix some "Using plain integer as NULL pointer" warnings - - sparse: Fix an "symbol 'cmd_index_pack' not declared" warning - - Makefile: Use cgcc rather than sparse in the check target + (merged to 'next' on 2011-04-25 at e1af2af) + + sparse: Fix some "symbol not declared" warnings + + sparse: Fix errors due to missing target-specific variables + + sparse: Fix an "symbol 'merge_file' not decared" warning + + sparse: Fix an "symbol 'format_subject' not declared" warning + + sparse: Fix some "Using plain integer as NULL pointer" warnings + + sparse: Fix an "symbol 'cmd_index_pack' not declared" warning + + Makefile: Use cgcc rather than sparse in the check target -* ab/i18n-fixup (2011-04-14) 24 commits - - i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 - - i18n: use test_i18n{grep,cmp} in t7508 - - i18n: use test_i18ngrep in t7506 - - i18n: use test_i18ngrep and test_i18ncmp in t7502 - - i18n: use test_i18ngrep in t7501 - - i18n: use test_i18ncmp in t7500 - - i18n: use test_i18ngrep in t7201 - - i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 - - i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 - - i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 - - i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 - - i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 - - i18n: use test_i18ngrep in lib-httpd and t2019 - - i18n: do not overuse C_LOCALE_OUTPUT (grep) - - i18n: use test_i18ncmp in t1200 and t2200 - - i18n: .git file is not a human readable message (t5601) - (merged to 'next' on 2011-04-12 at a94aa85) - + i18n: do not overuse C_LOCALE_OUTPUT - + i18n: mark init-db messages for translation - + i18n: mark checkout plural warning for translation - + i18n: mark checkout --detach messages for translation - + i18n: mark clone nonexistent repository message for translation - + i18n: mark merge CHERRY_PICK_HEAD messages for translation - + i18n: mark merge "upstream" messages for translation - + i18n: mark merge "Could not read from" message for translation - -Fix-up patches queued near the tip avoid excessive use of C_LOCALE_OUTPUT -to skip the entire tests. They skip only the parts that need to be skipped -without changing the sequence of commands that are run under GETTEXT_POISON -mode, which should be a big gain. +Will merge to "master" by the end of week #1. * cn/format-patch-quiet (2011-04-12) 2 commits - (merged to 'next' on 2011-04-12 at 915a915) + (merged to 'next' on 2011-04-25 at 40e2d1c) + format-patch: document --quiet option + format-patch: don't pass on the --quiet flag -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -release. +Will merge to "master" by the end of week #1. * dm/stash-k-i-p (2011-04-07) 2 commits - (merged to 'next' on 2011-04-11 at 8349531) + (merged to 'next' on 2011-04-25 at 01a207c) + stash: ensure --no-keep-index and --patch can be used in any order + stash: add two more tests for --no-keep-index -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -releases. - -* jc/magic-pathspec (2011-04-06) 3 commits - (merged to 'next' on 2011-04-08 at c5247ce) - + magic pathspec: add ":(icase)path" to match case insensitively - + magic pathspec: futureproof shorthand form - + magic pathspec: add tentative ":/path/from/top/level" pathspec support - (this branch is tangled with jc/add-u-migration-2.) - -Thanks to Peff, Duy, and Michael for helping to whip the syntax and -the basic semantics into a not-so-horrible shape. Will not merge until -the 1.7.5 ships, though. +Will merge to "master" by the end of week #1. * jc/merge-dash-previous (2011-04-07) 1 commit - (merged to 'next' on 2011-04-11 at 06480d1) + (merged to 'next' on 2011-04-25 at 512faf4) + merge: allow "-" as a short-hand for "previous branch" -Should graduate soon after 1.7.5 ships. +Will merge to "master" by the end of week #1. * rr/doc-content-type (2011-04-07) 4 commits - (merged to 'next' on 2011-04-11 at dca8914) + (merged to 'next' on 2011-04-25 at 83c41e4) + Documentation: Allow custom diff tools to be specified in 'diff.tool' + Documentation: Add diff..* to config + Documentation: Move diff..* from config.txt to diff-config.txt + Documentation: Add filter..* to config -Is everybody happy with the new wording? - -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -releases. - -* dm/http-cleanup (2011-03-30) 2 commits - - http-push: refactor curl_easy_setup madness - - http: make curl callbacks match contracts from curl header - -I didn't see anything glaringly wrong with this, but I would appreciate -extra sets of eyeballs from people who have worked on HTTP transports to -double check. +Will merge to "master" by the end of week #1. * jc/pack-objects-bigfile (2011-04-05) 1 commit - (merged to 'next' on 2011-04-11 at 86c52b1) + (merged to 'next' on 2011-04-25 at 621035c) + Teach core.bigfilethreashold to pack-objects -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -releases. +Will merge to "master" by the end of week #1. * jk/maint-stash-oob (2011-04-06) 2 commits - (merged to 'next' on 2011-04-11 at d882935) + (merged to 'next' on 2011-04-25 at 8478a92) + stash: fix false positive in the invalid ref test. + stash: fix accidental apply of non-existent stashes -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -releases. +Will merge to "master" by the end of week #1. * nk/blame-abbrev (2011-04-06) 1 commit - (merged to 'next' on 2011-04-11 at 19e8676) + (merged to 'next' on 2011-04-25 at 59a4281) + blame: add --abbrev command line option and make it honor core.abbrev -Should graduate soon after 1.7.5 ships. - -* nm/submodule-update-force (2011-04-01) 1 commit - (merged to 'next' on 2011-04-11 at d94f6f3) - + submodule: Add --force option for git submodule update - -Are submodule users happy with this change? - -Should graduate soon after 1.7.5 ships. +Will merge to "master" by the end of week #1. * jk/maint-upload-pack-shallow (2011-04-06) 1 commit - (merged to 'next' on 2011-04-11 at 9104545) + (merged to 'next' on 2011-04-25 at 073dac4) + upload-pack: start pack-objects before async rev-list -A sensible and low-impact fix. Should graduate soon after 1.7.5 ships -and merged to 1.7.4.X and 1.7.5.1 releases. +Will merge to "master" by the end of week #1. * jk/stash-loosen-safety (2011-04-05) 1 commit - (merged to 'next' on 2011-04-11 at b59c533) + (merged to 'next' on 2011-04-25 at cdc549f) + stash: drop dirty worktree check on apply -Should graduate soon after 1.7.5 ships. +Will merge to "master" by the end of week #1. * dm/color-palette (2011-04-05) 1 commit - (merged to 'next' on 2011-04-04 at 0244ef9) + (merged to 'next' on 2011-04-25 at 839b17b) + Share color list between graph and show-branch -Should graduate soon after 1.7.5 ships. +Will merge to "master" by the end of week #1. * mg/sha1-path-advise (2011-03-31) 2 commits - (merged to 'next' on 2011-04-04 at e429e0c) + (merged to 'next' on 2011-04-25 at 8b094f5) + sha1_name: Suggest commit:./file for path in subdir + t1506: factor out test for "Did you mean..." -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release. +Will merge to "master" by the end of week #1. * ar/clean-rmdir-empty (2011-04-01) 1 commit - (merged to 'next' on 2011-04-03 at c63fac8) + (merged to 'next' on 2011-04-25 at 5a71fdb) + clean: unreadable directory may still be rmdir-able if it is empty -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1 -releases. - -* jk/maint-push-async-hang (2011-03-31) 4 commits - - send-pack: abort sideband demuxer on pack-objects error - - run-command: allow aborting async code prematurely - - finish_async: be quiet when waiting for async process - - teach wait_or_whine a "quiet" mode - (this branch is used by jk/maint-push-async-hang-threads.) - -* jk/maint-push-async-hang-threads (2011-03-31) 2 commits - - run-command: implement abort_async for pthreads - - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads - (this branch uses jk/maint-push-async-hang.) - -These two series aim for a good goal, but needs reroll after 1.7.5 with -sign-offs. +Will merge to "master" by the end of week #1. * mg/reflog-with-options (2011-04-01) 3 commits - (merged to 'next' on 2011-04-03 at e69a95c) + (merged to 'next' on 2011-04-25 at 1ab8b78) + reflog: fix overriding of command line options + t/t1411: test reflog with formats + builtin/log.c: separate default and setup of cmd_log_init() (this branch is used by mg/show-without-prune.) -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release. +Will merge to "master" by the end of week #1. * mh/git-svn-automkdirs (2011-04-01) 1 commit - (merged to 'next' on 2011-04-03 at 7fa4978) + (merged to 'next' on 2011-04-25 at 2e95357) + git-svn: add an option to skip the creation of empty directories -Should be safe, but I'd like an Ack from git-svn folks. +Will merge to "master" by the end of week #1. + +* ab/i18n-fixup (2011-04-14) 24 commits + (merged to 'next' on 2011-04-25 at 32fef07) + + i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 + + i18n: use test_i18n{grep,cmp} in t7508 + + i18n: use test_i18ngrep in t7506 + + i18n: use test_i18ngrep and test_i18ncmp in t7502 + + i18n: use test_i18ngrep in t7501 + + i18n: use test_i18ncmp in t7500 + + i18n: use test_i18ngrep in t7201 + + i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 + + i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060 + + i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 + + i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 + + i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 + + i18n: use test_i18ngrep in lib-httpd and t2019 + + i18n: do not overuse C_LOCALE_OUTPUT (grep) + + i18n: use test_i18ncmp in t1200 and t2200 + + i18n: .git file is not a human readable message (t5601) + + i18n: do not overuse C_LOCALE_OUTPUT + + i18n: mark init-db messages for translation + + i18n: mark checkout plural warning for translation + + i18n: mark checkout --detach messages for translation + + i18n: mark clone nonexistent repository message for translation + + i18n: mark merge CHERRY_PICK_HEAD messages for translation + + i18n: mark merge "upstream" messages for translation + + i18n: mark merge "Could not read from" message for translation + +Will merge to "master" by the end of week #2. + +* nm/submodule-update-force (2011-04-01) 1 commit + (merged to 'next' on 2011-04-25 at 270fffc) + + submodule: Add --force option for git submodule update + +Will merge to "master" by the end of week #2. * jc/diff-irreversible-delete (2011-02-28) 1 commit - (merged to 'next' on 2011-04-03 at 5a23b23) + (merged to 'next' on 2011-04-25 at c37610d) + git diff -D: omit the preimage of deletes -Should graduate soon after 1.7.5 ships. +Will merge to "master" by the end of week #2. * jh/notes-add-ui (2011-03-30) 1 commit - (merged to 'next' on 2011-04-11 at 72e7c39) + (merged to 'next' on 2011-04-25 at 4fb1ac2) + Make "git notes add" more user-friendly when there are existing notes -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release. +Will merge to "master" by the end of week #2. * jk/notes-ui-updates (2011-04-14) 8 commits - (merged to 'next' on 2011-04-14 at b9f1b13) + (merged to 'next' on 2011-04-25 at 4216d33) + contrib/completion: --notes, --no-notes - (merged to 'next' on 2011-04-11 at 313d6c4) + log/pretty-options: Document --[no-]notes and deprecate old notes options + revision.c: make --no-notes reset --notes list + revision.c: support --notes command-line option @@ -352,24 +378,19 @@ Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release. + revision.c: refactor notes ref expansion + notes: make expand_notes_ref globally accessible -Should graduate soon after 1.7.5 ships. +Will merge to "master" by the end of week #2. * nd/maint-setup (2011-03-26) 2 commits - (merged to 'next' on 2011-03-31 at 2c36f6a) + (merged to 'next' on 2011-04-25 at fd45c63) + Kill off get_relative_cwd() + setup: return correct prefix if worktree is '/' -This benefits only the minority who use /.git at the root level of the -filesystem, but the changed code is used from many codepaths. - -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release. +Will merge to "master" by the end of week #2. * mz/rebase (2011-02-28) 34 commits - (merged to 'next' on 2011-03-31 at 3b1343c) + (merged to 'next' on 2011-04-25 at 4bbed46) + rebase: define options in OPTIONS_SPEC - (merged to 'next' on 2011-02-25 at 52caa7a) + Makefile: do not install sourced rebase scripts - (merged to 'next' on 2011-02-22 at 3219155) + rebase: use @{upstream} if no upstream specified + rebase -i: remove unnecessary state rebase-root + rebase -i: don't read unused variable preserve_merges @@ -403,86 +424,58 @@ Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release. + rebase: refactor reading of state + rebase: clearer names for directory variables -I wanted to wait for an independent Ack or two for the tip one, which was -a response to regression concerns raised by J6t, but ended up merging it -to 'next' after giving another look. Will not merge before 1.7.5, as -there is no user visible improvements up to this point. - -* jk/maint-merge-rename-create (2011-03-25) 3 commits - (merged to 'next' on 2011-03-31 at b9bc9f1) - + merge: turn on rewrite detection - + merge: handle renames with replacement content - + t3030: fix accidental success in symlink rename - -Peff wanted to reroll this. +Will merge to "master" by the end of week #2. * mz/maint-rename-unmerged (2011-03-23) 1 commit - (merged to 'next' on 2011-03-31 at c7b3d9a) + (merged to 'next' on 2011-04-25 at 038a8c3) + diffcore-rename: don't consider unmerged path as source -Will cook until 1.7.5 final. +Will merge to "master" by the end of week #2. * nd/struct-pathspec (2011-04-05) 5 commits - (merged to 'next' on 2011-04-11 at ee794a5) + (merged to 'next' on 2011-04-25 at 65dbe80) + pathspec: rename per-item field has_wildcard to use_wildcard - (merged to 'next' on 2011-03-31 at 66cbb7d) + Improve tree_entry_interesting() handling code + Convert read_tree{,_recursive} to support struct pathspec + Reimplement read_tree_recursive() using tree_entry_interesting() + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec' -Will cook until 1.7.5 final. +Will merge to "master" by the end of week #2. + +* jc/magic-pathspec (2011-04-06) 3 commits + (merged to 'next' on 2011-04-25 at 788cd46) + + magic pathspec: add ":(icase)path" to match case insensitively + + magic pathspec: futureproof shorthand form + + magic pathspec: add tentative ":/path/from/top/level" pathspec support + +Thanks to Peff, Duy, and Michael for helping to whip the syntax and the +basic semantics into a not-so-horrible shape. + +Will merge to "master" by the end of week #2. * jc/rename-degrade-cc-to-c (2011-01-06) 4 commits - (merged to 'next' on 2011-03-31 at 8d685d7) + (merged to 'next' on 2011-04-25 at 25c195e) + diffcore-rename: fall back to -C when -C -C busts the rename limit + diffcore-rename: record filepair for rename src + diffcore-rename: refactor "too many candidates" logic + builtin/diff.c: remove duplicated call to diff_result_code() -Should graduate soon after 1.7.5 ships. - -* cn/system-path-tweak (2011-03-17) 1 commit - - system_path: use a static buffer - -Don't see much point in this itself. Probably will drop. +Will merge to "master" by the end of week #2. * en/merge-recursive (2011-03-17) 4 commits - (merged to 'next' on 2011-03-18 at a32016b) + (merged to 'next' on 2011-04-25 at 8027acd) + merge-recursive: tweak magic band-aid - (merged to 'next' on 2011-03-09 at 3762932) + merge-recursive: When we detect we can skip an update, actually skip it + t6022: New test checking for unnecessary updates of files in D/F conflicts + t6022: New test checking for unnecessary updates of renamed+modified files -I am not happy with these magic band aids. Will hold. +Will merge to "master" by the end of week #2. -------------------------------------------------- [Discarded] -* jc/add-u-migration (2011-03-22) 3 commits - . add: make "add -u/-A" update full tree without pathspec (step 3) - . add: make "add -u/-A" update full tree without pathspec (step 2) - (merged to 'next' on 2011-03-31 at 962e058) - + add: make "add -u/-A" update full tree without pathspec - (this branch is tangled with jc/add-u-migration-2.) - -* jc/add-u-migration-2 (2011-04-08) 5 commits - (merged to 'next' on 2011-04-08 at 524e365) - + Revert "add -u" default change plans - (merged to 'next' on 2011-04-06 at 4a6bb82) - + add -u: get rid of "treewideupdate" configuration - + Merge branch 'jc/magic-pathspec' into early parts of jc/add-u-migration - + magic pathspec: add tentative ":/path/from/top/level" pathspec support - (merged to 'next' on 2011-03-31 at 962e058) - + add: make "add -u/-A" update full tree without pathspec - (this branch is tangled with jc/add-u-migration and jc/magic-pathspec.) - -These attempt "add -u" migration plans (two versions), but then revert -both of them at the end where they are merged to 'next'. +* cn/system-path-tweak (2011-03-17) 1 commit + . system_path: use a static buffer * jh/gitweb-localtime (2011-03-23) 1 commit . gitweb: javascript ability to adjust time based on timezone - - - -- 2.47.3