diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-08 14:22:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-08 14:22:19 -0800 |
| commit | 5a2282de13c4da13f979185e652c8a08e2481fd1 (patch) | |
| tree | 873414f226d848057f9bb64140b629bf5215b9e9 /git-cvsexportcommit.perl | |
| parent | Add a test for rebase when a change was picked upstream (diff) | |
| parent | GIT 1.0.8 (diff) | |
| download | git-1.1.0.tar.gz git-1.1.0.zip | |
GIT 1.1.0v1.1.0
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 5a8c011802..d5fbee7ba0 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$/) { |