Re: What's cooking in git.git (Jan 2013, #05; Fri, 11)
On Mon, Jan 14, 2013 at 6:02 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Sat, Jan 12, 2013 at 6:56 AM, Junio C Hamano wrote: >>> * nd/parse-pathspec (2013-01-11) 20 commits >>> >>> Uses the parsed pathspec structure in more places where we used to >>> use the raw "array of strings" pathspec. >>> >>> Unfortunately, this conflicts a couple of topics in flight. I tried >>> to be careful while resolving conflicts, though. >> >> parse_pathspec has not picked up init_pathspec changes from >> jk/pathspec-literal and nd/pathspec-wildcard (already in master) so >> --literal-pathspecs is probably broken in 'pu' after a lot of >> init_pathspec -> parse_pathspec conversion. > > I guess it may be a better way forward to hold the series off, and > instead help polishing the other topics that are depended on so that > they can graduate sooner, given multiple topics in flight wants to > touch pathspecs (either change the way they are handled, or adds new > places that use them). No problem. Just tell me when you want me to flood git@vger again. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jan 2013, #05; Fri, 11)
Duy Nguyen writes: > On Sat, Jan 12, 2013 at 6:56 AM, Junio C Hamano wrote: >> * nd/parse-pathspec (2013-01-11) 20 commits >> >> Uses the parsed pathspec structure in more places where we used to >> use the raw "array of strings" pathspec. >> >> Unfortunately, this conflicts a couple of topics in flight. I tried >> to be careful while resolving conflicts, though. > > parse_pathspec has not picked up init_pathspec changes from > jk/pathspec-literal and nd/pathspec-wildcard (already in master) so > --literal-pathspecs is probably broken in 'pu' after a lot of > init_pathspec -> parse_pathspec conversion. I guess it may be a better way forward to hold the series off, and instead help polishing the other topics that are depended on so that they can graduate sooner, given multiple topics in flight wants to touch pathspecs (either change the way they are handled, or adds new places that use them). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jan 2013, #05; Fri, 11)
On Sat, Jan 12, 2013 at 6:56 AM, Junio C Hamano wrote: > * nd/parse-pathspec (2013-01-11) 20 commits > > Uses the parsed pathspec structure in more places where we used to > use the raw "array of strings" pathspec. > > Unfortunately, this conflicts a couple of topics in flight. I tried > to be careful while resolving conflicts, though. parse_pathspec has not picked up init_pathspec changes from jk/pathspec-literal and nd/pathspec-wildcard (already in master) so --literal-pathspecs is probably broken in 'pu' after a lot of init_pathspec -> parse_pathspec conversion. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
What's cooking in git.git (Jan 2013, #05; Fri, 11)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. As usual, this cycle is expected to last for 8 to 10 weeks, with a preview -rc0 sometime in the middle of next month. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -- [Graduated to "master"] * as/api-allocation-doc (2013-01-06) 1 commit (merged to 'next' on 2013-01-08 at c80b544) + api-allocation-growing.txt: encourage better variable naming * as/dir-c-cleanup (2012-12-28) 10 commits (merged to 'next' on 2013-01-08 at 5aee090) + dir.c: rename free_excludes() to clear_exclude_list() + dir.c: refactor is_path_excluded() + dir.c: refactor is_excluded() + dir.c: refactor is_excluded_from_list() + dir.c: rename excluded() to is_excluded() + dir.c: rename excluded_from_list() to is_excluded_from_list() + dir.c: rename path_excluded() to is_path_excluded() + dir.c: rename cryptic 'which' variable to more consistent name + Improve documentation and comments regarding directory traversal API + api-directory-listing.txt: update to match code (this branch is used by as/check-ignore.) Refactor and generally clean up the directory traversal API implementation. * aw/rebase-am-failure-detection (2012-10-11) 1 commit (merged to 'next' on 2013-01-07 at 9e2ee43) + rebase: Handle cases where format-patch fails Originally merged to 'next' on 2013-01-02 Save output from format-patch command in a temporary file, just in case it aborts, to give a better failure-case behaviour. * jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit (merged to 'next' on 2013-01-08 at dea04e8) + Makefile: add comment on CYGWIN_V15_WIN32API * jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit (merged to 'next' on 2013-01-07 at 497bf10) + merge --no-edit: do not credit people involved in the side branch Originally merged to 'next' on 2013-01-02 Stop spending cycles to compute information to be placed on commented lines in "merge --no-edit". * jk/config-uname (2013-01-03) 1 commit (merged to 'next' on 2013-01-08 at f986500) + Makefile: hoist uname autodetection to config.mak.uname Move the bits to set fallback default based on the platform from the main Makefile to a separate file, so that it can be included in Makefiles in subdirectories. * jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit (merged to 'next' on 2013-01-08 at 568f874) + clone: support atomic operation with --separate-git-dir When "git clone --separate-git-dir" is interrupted, we failed to remove the real location we created the repository. * mz/pick-unborn (2012-12-23) 2 commits (merged to 'next' on 2013-01-07 at c6c062b) + learn to pick/revert into unborn branch + tests: move test_cmp_rev to test-lib-functions Originally merged to 'next' on 2013-01-02 Allows "git cherry-pick $commit" when you do not have any history behind HEAD yet. * nd/wildmatch (2013-01-01) 18 commits (merged to 'next' on 2013-01-07 at 2a39f7d) + wildmatch: replace variable 'special' with better named ones + compat/fnmatch: respect NO_FNMATCH* even on glibc + wildmatch: fix "**" special case + t3070: Disable some failing fnmatch tests + test-wildmatch: avoid Windows path mangling + Support "**" wildcard in .gitignore and .gitattributes + wildmatch: make /**/ match zero or more directories + wildmatch: adjust "**" behavior + wildmatch: fix case-insensitive matching + wildmatch: remove static variable force_lower_case + wildmatch: make wildmatch's return value compatible with fnmatch + t3070: disable unreliable fnmatch tests + Integrate wildmatch to git + wildmatch: follow Git's coding convention + wildmatch: remove unnecessary functions + Import wildmatch from rsync + ctype: support iscntrl, ispunct, isxdigit and isprint + ctype: make sane_ctype[] const array (this branch is used by nd/retire-fnmatch.) Originally merged to 'next' on 2013-01-01 Allows pathname patterns in .gitignore and .gitattributes files with double-asterisks "foo/**/bar" to match any number of directory hierarchies. * rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit (merged to 'next' on 2013-01-08 at 98f325e) + archive-tar: split long paths more carefully Improve compatibility with implementations of "tar" that do not like empty name field in header (with the additional prefix field holding everything). * tb/test-shell-lint (2013-01-02) 1 commit (merged to 'next' on 2013-01-07 at 0bca54a) + test: Add check-non-portable-shell.pl Originally merged to 'next' on 2013-01-04 Check for common mistakes in the test scripts, based on simple pattern-matching. -- [New Topics] * jk/maint-fast-import-doc-reorder (2013-01-09)
