Re: What's cooking in git.git (Jan 2013, #06; Mon, 14)
On Mon, Jan 14, 2013 at 10:23 PM, Junio C Hamano gits...@pobox.com wrote: * as/check-ignore (2013-01-10) 12 commits (merged to 'next' on 2013-01-14 at 9df2afc) + t0008: avoid brace expansion + add git-check-ignore sub-command + setup.c: document get_pathspec() + add.c: extract new die_if_path_beyond_symlink() for reuse + add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse + pathspec.c: rename newly public functions for clarity + add.c: move pathspec matchers into new pathspec.c for reuse + add.c: remove unused argument from validate_pathspec() + dir.c: improve docs for match_pathspec() and match_pathspec_depth() + dir.c: provide clear_directory() for reclaiming dir_struct memory + dir.c: keep track of where patterns came from + dir.c: use a single struct exclude_list per source of excludes Add a new command git check-ignore for debugging .gitignore files. The above is v4 plus the t0008: avoid brace expansion fix. v4 is slightly outdated and not quite the right version to merge to 'next'. I'll post a v5 re-roll as per: http://thread.gmane.org/gmane.comp.version-control.git/212184/focus=212856 in the next 24 hours or so. I think the t0008: avoid brace expansion fix at the tip should probably be squashed into its parent. I've amended the commit message accordingly in my github fork. Thanks, Adam -- 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, #06; Mon, 14)
Adam Spiers g...@adamspiers.org writes: On Mon, Jan 14, 2013 at 10:23 PM, Junio C Hamano gits...@pobox.com wrote: * as/check-ignore (2013-01-10) 12 commits (merged to 'next' on 2013-01-14 at 9df2afc) + t0008: avoid brace expansion + add git-check-ignore sub-command + setup.c: document get_pathspec() + add.c: extract new die_if_path_beyond_symlink() for reuse + add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse + pathspec.c: rename newly public functions for clarity + add.c: move pathspec matchers into new pathspec.c for reuse + add.c: remove unused argument from validate_pathspec() + dir.c: improve docs for match_pathspec() and match_pathspec_depth() + dir.c: provide clear_directory() for reclaiming dir_struct memory + dir.c: keep track of where patterns came from + dir.c: use a single struct exclude_list per source of excludes Add a new command git check-ignore for debugging .gitignore files. The above is v4 plus the t0008: avoid brace expansion fix. v4 is slightly outdated and not quite the right version to merge to 'next'. Sigh. The What's cooking is a report of what _has_ already happened. I would have appreciated if you said the above _before_ this happened. I'll post a v5 re-roll as per: Now the series is in 'next', it is too late to _replace_ it X-. Could you instead make an incremental updates on top? That way, we do not have to re-review the whole thing; we only need to review the changes relative to the old one, making sure that the fixes in the updates are better than the v4 version. Thanks. -- 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, #06; Mon, 14)
Junio C Hamano gits...@pobox.com writes: [New Topics] * jc/cvsimport-upgrade (2013-01-14) 8 commits - t9600: adjust for new cvsimport - t9600: further prepare for sharing - cvsimport-3: add a sample test - cvsimport: make tests reusable for cvsimport-3 - cvsimport: start adding cvsps 3.x support - cvsimport: introduce a version-switch wrapper - cvsimport: allow setting a custom cvsps (2.x) program name - Makefile: add description on PERL/PYTHON_PATH The most important part of this series is the addition of the new cvsimport by Eric Raymond that works with cvsps 3.x. Given some distros have inertia to be conservative, Git with cvsimport that does not work with both 3.x will block adoption of cvsps 3.x by them, and shipping Git with cvsimport that does not work with cvsps 2.x will block such a version of Git, so we'll do the proven both old and new are available, but we aim to deprecate and remove the old one in due time strategy that we used successfully in the past. My reading of the review discussion of this series, and the discussion in the $gmane/213170 thread, is that the approach outlined in this series is something Git-side is comfortable working with. I personally think it will be slightly less work on your side to keep the cvsps 3.x + new cvsimport combo improving, because you no longer need to worry about punting to the old cvsimport. In addition, I think the new layout would make it easier for the new combo to gain trust of existing Git userbase over time by adding more t965x series of tests that correspond to the tests in the t960x series, working on the same (simple) CVS histories, demonstrating that the result would be what users expect, and guarding the code from future breakage. By giving options to pick and choose both old and new cvsps, I think it will make it easier for distros to include cvsps 3.x sooner, promoting its adoption, which will in turn benefit us. I converted one of Chris's follow-up test tweaks to this to illustrate how it can be done without breaking tests for the original cvsimport, but didn't do all of them. Chris, is this a foundation we can work together on top? Even though I assigned Author: to the start adding cvsps 3 patch, I forgot to forge Eric's sign-off to it. If Eric is OK with the direction this series is going, I'll do so and advance the rerolled series to 'next'. Thanks. -- 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, #06; Mon, 14)
On Mon, Jan 14, 2013 at 9:02 PM, Junio C Hamano gits...@pobox.com wrote: I converted one of Chris's follow-up test tweaks to this to illustrate how it can be done without breaking tests for the original cvsimport, but didn't do all of them. Chris, is this a foundation we can work together on top? Sure, looks straightforward and makes things easier. Thanks, Chris -- 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
