To: git@vger.kernel.org
-Subject: What's cooking in git.git (Feb 2011, #06; Sun, 27)
-X-master-at: 8978166e531e0941811099d4117574ebbbcf35d8
-X-next-at: 4aa7278540f2c67a375cee26edfb39164695d3e8
+Subject: What's cooking in git.git (Feb 2011, #07; Mon, 28)
+X-master-at: f70f736bcbb22cfe434eaf20089d9713b991ee31
+X-next-at: 0b70480002217322d29f03aafa94d076d6e8c8d5
-What's cooking in git.git (Feb 2011, #06; Sun, 27)
+What's cooking in git.git (Feb 2011, #07; Mon, 28)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
---------------------------------------------------
-[Graduated to "master"]
-
-* en/object-list-with-pathspec (2010-09-20) 2 commits
- (merged to 'next' on 2011-02-09 at ccf6c6a)
- + Add testcases showing how pathspecs are handled with rev-list --objects
- + Make rev-list --objects work together with pathspecs
- (this branch uses nd/struct-pathspec; is tangled with jc/grep--no-index-pathspec-fix.)
-
-* hv/mingw-fs-funnies (2011-02-07) 5 commits
- (merged to 'next' on 2011-02-09 at 3d0bb1a)
- + mingw_rmdir: set errno=ENOTEMPTY when appropriate
- + mingw: add fallback for rmdir in case directory is in use
- + mingw: make failures to unlink or move raise a question
- + mingw: work around irregular failures of unlink on windows
- + mingw: move unlink wrapper to mingw.c
-
-* jh/push-default-upstream-configname (2011-02-16) 1 commit
- (merged to 'next' on 2011-02-23 at b5c25fa)
- + push.default: Rename 'tracking' to 'upstream'
-
-* js/detach-doc (2011-02-20) 1 commit
- (merged to 'next' on 2011-02-21 at c384c3c)
- + git-checkout.txt: improve detached HEAD documentation
-
-* js/maint-merge-use-prepare-commit-msg-hook (2011-02-14) 1 commit
- (merged to 'next' on 2011-02-22 at 6458c4b)
- + merge: honor prepare-commit-msg hook
-
-* lp/config-vername-check (2011-02-01) 2 commits
- (merged to 'next' on 2011-02-23 at 426d48d)
- + Disallow empty section and variable names
- + Sanity-check config variable names
-
-* mg/patch-id (2011-02-17) 2 commits
- (merged to 'next' on 2011-02-22 at 6f4acd8)
- + git-patch-id: do not trip over "no newline" markers
- + git-patch-id: test for "no newline" markers
-
-* mg/placeholders-are-lowercase (2011-02-17) 5 commits
- (merged to 'next' on 2011-02-22 at 2754e21)
- + Make <identifier> lowercase in Documentation
- + Make <identifier> lowercase as per CodingGuidelines
- + Make <identifier> lowercase as per CodingGuidelines
- + Make <identifier> lowercase as per CodingGuidelines
- + CodingGuidelines: downcase placeholders in usage messages
-
-* mo/perl-bidi-pipe-envfix (2011-02-15) 1 commit
- (merged to 'next' on 2011-02-15 at c36e816)
- + perl: command_bidi_pipe() method should set-up git environmens
-
-* mz/rerere-remaining (2011-02-16) 2 commits
- (merged to 'next' on 2011-02-22 at fa2d5ab)
- + mergetool: don't skip modify/remove conflicts
- + rerere "remaining"
-
-* nd/hash-object-sanity (2011-02-05) 1 commit
- (merged to 'next' on 2011-02-22 at 09acf6f)
- + Make hash-object more robust against malformed objects
-
-* nd/sorted-builtin-command-list (2011-02-15) 1 commit
- (merged to 'next' on 2011-02-22 at 91fccd1)
- + git.c: reorder builtin command list
-
-* nd/struct-pathspec (2011-01-31) 22 commits
- (merged to 'next' on 2011-02-09 at b1e64ee)
- + t6004: add pathspec globbing test for log family
- + t7810: overlapping pathspecs and depth limit
- + grep: drop pathspec_matches() in favor of tree_entry_interesting()
- + grep: use writable strbuf from caller for grep_tree()
- + grep: use match_pathspec_depth() for cache/worktree grepping
- + grep: convert to use struct pathspec
- + Convert ce_path_match() to use match_pathspec_depth()
- + Convert ce_path_match() to use struct pathspec
- + struct rev_info: convert prune_data to struct pathspec
- + pathspec: add match_pathspec_depth()
- + tree_entry_interesting(): optimize wildcard matching when base is matched
- + tree_entry_interesting(): support wildcard matching
- + tree_entry_interesting(): fix depth limit with overlapping pathspecs
- + tree_entry_interesting(): support depth limit
- + tree_entry_interesting(): refactor into separate smaller functions
- + diff-tree: convert base+baselen to writable strbuf
- + glossary: define pathspec
- + Move tree_entry_interesting() to tree-walk.c and export it
- + tree_entry_interesting(): remove dependency on struct diff_options
- + Convert struct diff_options to use struct pathspec
- + diff-no-index: use diff_tree_setup_paths()
- + Add struct pathspec
- (this branch is used by en/object-list-with-pathspec and jc/grep--no-index-pathspec-fix.)
-
-* pw/p4 (2011-02-19) 8 commits
- (merged to 'next' on 2011-02-21 at 1a7b7d2)
- + git-p4: support clone --bare
- + git-p4: decode p4 wildcard characters
- + git-p4: better message for "git-p4 sync" when not cloned
- + git-p4: reinterpret confusing p4 message
- + git-p4: accommodate new move/delete type in p4
- + git-p4: add missing newline in initial import message
- + git-p4: fix key error for p4 problem
- + git-p4: test script
-
-* sp/maint-smart-http-sans-100-continue (2011-02-15) 1 commit
- (merged to 'next' on 2011-02-15 at 553e3e5)
- + smart-http: Don't use Expect: 100-Continue
-
-* uk/checkout-ambiguous-ref (2011-02-15) 5 commits
- (merged to 'next' on 2011-02-15 at 645dad6)
- + Rename t2019 with typo "amiguous" that meant "ambiguous"
- + checkout: rearrange update_refs_for_switch for clarity
- + checkout: introduce --detach synonym for "git checkout foo^{commit}"
- + checkout: split off a function to peel away branchname arg
- (merged to 'next' on 2011-02-03 at 9044724)
- + checkout: fix bug with ambiguous refs
-
-* va/p4 (2011-02-20) 2 commits
- (merged to 'next' on 2011-02-21 at d981b23)
- + git-p4: Add copy detection support
- + git-p4: Improve rename detection support
+I started draft release notes for 1.7.5 on 'master' branch.
--------------------------------------------------
[New Topics]
+* jc/diff-irreversible-delete (2011-02-28) 1 commit
+ - git diff -D: omit the preimage of deletes
+
+Just a POC.
+
+* jc/index-pack (2011-02-25) 5 commits
+ - index-pack --verify: read anomalous offsets from v2 idx file
+ - write_idx_file: need_large_offset() helper function
+ - index-pack: --verify
+ - 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.
+
+* mm/push-default-advice (2011-02-28) 2 commits
+ - push: better error messages for detached HEAD and "no destination"
+ - push: better error message when push.default = tracking
+
+There were some rewording discussion I didn't roll into this, not because
+I had objections to, but because I was handling other topics. I expect
+I'll see a reroll soonish so that we can merge this down soonish.
+
+* sp/maint-fd-limit (2011-02-28) 2 commits
+ - mingw: add minimum getrlimit() compatibility stub
+ - Limit file descriptors used by packs
+
+Erik, please check the made-up commit log message and sign it off.
+Will merge to 'next' after that.
+
+* uk/ls-remote-in-get-remote-url (2011-02-28) 1 commit
+ - get_remote_url(): use the same data source as ls-remote to get remote urls
+
+Will merge to 'next'.
+
+--------------------------------------------------
+[Stalled]
+
+* jh/merge-sans-branch (2011-02-10) 4 commits
+ . merge: add support for merging from upstream by default
+ - merge: introduce per-branch-configuration helper function
+ - merge: introduce setup_merge_commit helper function
+ - merge: update the usage information to be more modern
+
+There was an objection to the tip one that determines the upstream in a
+wrong way?
+
+* jc/complete-symmetric-diff (2011-02-23) 1 commit
+ - completion: complete "git diff ...branc<TAB>"
+
+It was pointed out that this would regress diffing two blobs,
+using <tree>:<path> syntax.
+
+* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
+ - Look for password in both CVS and CVSNT password files.
+
+It seems that we need separate parsers for these two formats in order not
+to regress the users of the original cvs.
+
+* jk/tag-contains (2010-07-05) 4 commits
+ - Why is "git tag --contains" so slow?
+ - default core.clockskew variable to one day
+ - limit "contains" traversals based on commit timestamp
+ - tag: speed up --contains calculation
+
+The idea of the bottom one is probably Ok, except that the use of object
+flags needs to be rethought, or at least the helper needs to be moved to
+builtin/tag.c to make it clear that it should not be used outside the
+current usage context.
+
+* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
+ . 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
+
+Somebody said that this is an expensive no-op?
+
+--------------------------------------------------
+[Cooking]
+
* jn/maint-commit-missing-template (2011-02-25) 1 commit
(merged to 'next' on 2011-02-25 at c95589d)
+ commit: error out for missing commit message template
- mergetool--lib: Add Beyond Compare 3 as a tool
- mergetool--lib: Sort tools alphabetically for easier lookup
---------------------------------------------------
-[Stalled]
-
-* jh/merge-sans-branch (2011-02-10) 4 commits
- . merge: add support for merging from upstream by default
- - merge: introduce per-branch-configuration helper function
- - merge: introduce setup_merge_commit helper function
- - merge: update the usage information to be more modern
-
-There was an objection to the tip one that determines the upstream in a
-wrong way?
-
-* jk/tag-contains (2010-07-05) 4 commits
- - Why is "git tag --contains" so slow?
- - default core.clockskew variable to one day
- - limit "contains" traversals based on commit timestamp
- - tag: speed up --contains calculation
-
-The idea of the bottom one is probably Ok, except that the use of object
-flags needs to be rethought, or at least the helper needs to be moved to
-builtin/tag.c to make it clear that it should not be used outside the
-current usage context.
-
-* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
- . 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
-
---------------------------------------------------
-[Cooking]
+Will merge to 'next'.
* nd/index-doc (2010-09-06) 1 commit
- doc: technical details about the index file format
+I'll try to find time to fill in the details.
+
* ab/i18n-st (2011-02-22) 74 commits
- i18n: git-shortlog basic messages
- i18n: git-revert split up "could not revert/apply" message
patches), and am even tempted to rebase other patches on 'pu' that are not
yet in 'next' on top of them, to make the transition easier.
-* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
- - Look for password in both CVS and CVSNT password files.
+Unless there is something glaringly wrong, I'd merge up to 9018b8a (i18n:
+git-clone "Cloning into" message) to 'next' soonish, possibly rebasing
+other 'pu'-only topics on top of that commit.
* jc/checkout-orphan-warning (2011-02-18) 1 commit
- commit: give final warning when reattaching HEAD to leave commits behind
-Likes, dislikes?
-
* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit
- branch/checkout --track: Ensure that upstream branch is indeed a branch
+Will merge to 'next'.
+
* jk/diffstat-binary (2011-02-19) 2 commits
(merged to 'next' on 2011-02-23 at 49da967)
+ diff: don't retrieve binary blobs for diffstat
- bump rename limit defaults (again)
- merge: improve inexact rename limit warning
-The above three all seemed sensible improvements.
+Will merge to 'next'.
* jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit
(merged to 'next' on 2011-02-23 at d754139)
- t6007: Make sure we test --cherry-pick
- revlist.c: introduce --left/right-only for unsymmetric picking
+Will merge to 'next'; somebody may want to try losing many lines from
+format-patch before it hits 'master', though. Hint, hint...
+
* so/submodule-no-update-first-time (2011-02-17) 2 commits
(merged to 'next' on 2011-02-23 at 2c6e8c9)
+ t7406: "git submodule update {--merge|--rebase]" with new submodules
+ submodule: no [--merge|--rebase] when newly cloned
-* jc/complete-symmetric-diff (2011-02-23) 1 commit
- - completion: complete "git diff ...branc<TAB>"
-
* jh/submodule-fetch-on-demand (2011-02-23) 6 commits
- submodule update: Don't fetch when the submodule commit is already present
- fetch/pull: Don't recurse into a submodule when commits are already present
- fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
- fetch/pull: recurse into submodules when necessary
+How well has this been cooked?
+
* jk/format-patch-multiline-header (2011-02-23) 3 commits
- format-patch: rfc2047-encode newlines in headers
- format-patch: wrap long header lines
- strbuf: add fixed-length version of add_wrapped_text
+Will merge to 'next'.
+
* js/checkout-untracked-symlink (2011-02-20) 2 commits
(merged to 'next' on 2011-02-23 at 52a35ce)
+ do not overwrite untracked symlinks
Minor UI regression was reported but otherwise it looked like that the
topic is in a good shape.
-
---------------------------------------------------
-[Discarded]
-
-* cp/mergetool-beyondcompare (2011-02-18) 1 commit
- . mergetool--lib: add support for beyond compare
-
-ss/mergetool--lib replaces this.
projects / thirdparty / git.git / commitdiff
