summaryrefslogtreecommitdiff
path: root/git-cvsexportcommit.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-08 22:22:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-08 22:22:19 (GMT)
commit5a2282de13c4da13f979185e652c8a08e2481fd1 (patch)
tree873414f226d848057f9bb64140b629bf5215b9e9 /git-cvsexportcommit.perl
parente77f489edf3865dbcfd329461355523bb3c21075 (diff)
parent8fc11b5aa98540f7caab87e22e5aae63512893a2 (diff)
downloadgit-5a2282de13c4da13f979185e652c8a08e2481fd1.zip
git-5a2282de13c4da13f979185e652c8a08e2481fd1.tar.gz
git-5a2282de13c4da13f979185e652c8a08e2481fd1.tar.bz2
GIT 1.1.0v1.1.0
Diffstat (limited to 'git-cvsexportcommit.perl')
-rwxr-xr-xgit-cvsexportcommit.perl12
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$/) {