summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennee <kernel-hacker@bennee.com>2007-10-18 16:15:44 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-19 00:51:16 (GMT)
commitfd0b9594d0c2bb50469bfc1481ea4395b7a76548 (patch)
tree7fe4d349b50f3a19617e1133fc240792ecbf428f
parent42a32174b600f139b489341b1281fb1bfa14c252 (diff)
downloadgit-fd0b9594d0c2bb50469bfc1481ea4395b7a76548.zip
git-fd0b9594d0c2bb50469bfc1481ea4395b7a76548.tar.gz
git-fd0b9594d0c2bb50469bfc1481ea4395b7a76548.tar.bz2
Ensure we add directories in the correct order
CVS gets understandably upset if you try and add a subdirectory before it's parent directory. This patch fixes that. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-cvsexportcommit.perl11
1 files changed, 11 insertions, 0 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index a33fa8d..7b19a33 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -224,6 +224,17 @@ print "Applying\n";
print "Patch applied successfully. Adding new files and directories to CVS\n";
my $dirtypatch = 0;
+
+#
+# We have to add the directories in order otherwise we will have
+# problems when we try and add the sub-directory of a directory we
+# have not added yet.
+#
+# Luckily this is easy to deal with by sorting the directories and
+# dealing with the shortest ones first.
+#
+@dirs = sort { length $a <=> length $b} @dirs;
+
foreach my $d (@dirs) {
if (system(@cvs,'add',$d)) {
$dirtypatch = 1;