In perl.git, the branch nicholas/bisect has been updated <http://perl5.git.perl.org/perl.git/commitdiff/63d4663dc8bb8eb23868bb759f32ef868f29b0e6?hp=d05446d0b8f3ccc46ea6965233e755a716504e3d>
- Log ----------------------------------------------------------------- commit 63d4663dc8bb8eb23868bb759f32ef868f29b0e6 Author: Yves Orton <[email protected]> Date: Mon Apr 16 20:23:32 2012 +0200 Tweak to make it clearer what to do if your working space is dirty If you try to biect in a directory with .gitignore'd files in it bisect will refuse to run. Since these files arent shown by status this can cause some head scratching. This patch makes it more obvious what is wrong by showing the listed files and suggesting git clean as a solution. I deliberately did not document the command to clean up untracked files, so people wouldn't knee jerk paste it somewhere and lose something important. And by people I mean me. :-) Thus it just shows the command to wipe ignored files, which I figure is safe. ----------------------------------------------------------------------- Summary of changes: Porting/bisect.pl | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Porting/bisect.pl b/Porting/bisect.pl index c52c740..f5c401b 100755 --- a/Porting/bisect.pl +++ b/Porting/bisect.pl @@ -82,9 +82,13 @@ foreach ($start, $end) { chomp; } -my $modified = () = `git ls-files --modified --deleted --others`; +my $modified = my @modified = `git ls-files --modified --deleted --others`; -die "This checkout is not clean - $modified modified or untracked file(s)" +die "This checkout is not clean, found file(s):\n", + join("\t","",@modified), + "$modified modified, untracked, or other file(s)\n", + "These files may not show in git status as they may be ignored.\n", + "You can use 'git clean -Xdf' to cleanup the ignored files.\n" if $modified; sub validate { -- Perl5 Master Repository
