-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Jeff, Am Fr den 30. Okt 2009 um 20:05 schrieb Jeff King: > On Fri, Oct 30, 2009 at 02:41:55PM -0400, Jeff King wrote: > > > > 6. Revert the patch and rework it so that it will only have effect if > > > there is no -i option on the command line. (That is similiar to a > > > mix of 3 and 4.) > > > > Yeah, that would actually be the least invasive change, and would keep > > "-i" just as it is. If we do anything except a simple, I think your (6) > > makes the most sense. Ok. > > Let me see if I can make a patch. Fine, thanks. > - Show ignored files in the output. > - Note that this also reverses any exclude list present. > + Show only ignored files in the output. When showing files in the > + index, print only those matched by an exclude pattern. When > + showing "other" files, show only those matched by an exclude > + pattern. Hmmm... I do not see that much difference. But that might be justified by my bad English. > --- a/t/t3003-ls-files-exclude.sh > +++ b/t/t3003-ls-files-exclude.sh > @@ -29,4 +29,12 @@ test_expect_success 'add file to gitignore' ' > ' > check_all_output > > +test_expect_success 'ls-files -i lists only tracked-but-ignored files' ' > + echo content >other-file && > + git add other-file && > + echo file >expect && > + git ls-files -i --exclude-standard >output && > + test_cmp expect output > +' > + > test_done Do that fit? shouldn't it be "test_cmp other-file output"? "git ls-files - -i --exclude-standard" should show the files in the index that are also in the exclude list. And you only add other-file to the index. And shouldn't there be also a "echo other-file > .gitignore"? Regards Klaus - -- Klaus Ethgen http://www.ethgen.de/ pub 2048R/D1A4EDE5 2000-02-26 Klaus Ethgen <Klaus@xxxxxxxxx> Fingerprint: D7 67 71 C4 99 A6 D4 FE EA 40 30 57 3C 88 26 2B -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iQEVAwUBSutGLJ+OKpjRpO3lAQqmZwgAi7DqPorAdp0dZtgMpgzCsrWTJx5xb/dv voQ4K5pYmxG1PgLb8zY7ywIvcG36uakCGvwgFQxsLzSgg0hRO1UsQ8XFVqSPp62X evsZ/On5LYHY3xz+Fl0cPM5oomtqY+ZmHAd5syj4oh6hSHM8J93RuQzGEfMshtrQ NUfAbAVmjuA5d4Cl/SLNUvoLE6M6O3YGkCGKXA9aPQcker6W+nODExJgTqyh4RHK ATfbPC6+VJGUPfjVGmrqHVW8LOb/wP7grEBMaHvGpP/ysh4FHjy6HtXLhyPSRES/ KpsMG5g0dF0dbS0qBgrIck+6cifiHNlAbxc5LF7tydFBMnRAmjDyeA== =7JTn -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html