diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-08 05:32:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-08 05:32:48 (GMT) |
| commit | 8fc11b5aa98540f7caab87e22e5aae63512893a2 (patch) | |
| tree | 42cc20556d8b4766d9a0adbcc2e32de22b9fc6c9 /git-cvsexportcommit.perl | |
| parent | 92e802c6ccb96d1b5e8561b0a136d43d82253293 (diff) | |
| parent | 6f2eacfeb2c67a7e05f98df2288d7893d3368c8e (diff) | |
| download | git-8fc11b5aa98540f7caab87e22e5aae63512893a2.zip git-8fc11b5aa98540f7caab87e22e5aae63512893a2.tar.gz git-8fc11b5aa98540f7caab87e22e5aae63512893a2.tar.bz2 | |
GIT 1.0.8v1.0.8
Diffstat (limited to 'git-cvsexportcommit.perl')
| -rwxr-xr-x | git-cvsexportcommit.perl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index 5a8c011..d5fbee7 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -103,8 +103,16 @@ undef @files; # don't need it anymore # check that the files are clean and up to date according to cvs my $dirty; -foreach my $f (@afiles, @mfiles, @dfiles) { - # TODO:we need to handle removed in cvs and/or new (from git) +foreach my $f (@afiles) { + my $status = `cvs -q status "$f" | grep '^File: '`; + + unless ($status =~ m/Status: Unknown$/) { + $dirty = 1; + warn "File $f is already known in your CVS checkout!\n"; + } +} +foreach my $f (@mfiles, @dfiles) { + # TODO:we need to handle removed in cvs my $status = `cvs -q status "$f" | grep '^File: '`; unless ($status =~ m/Status: Up-to-date$/) { |