summaryrefslogtreecommitdiff
path: root/git-cvsexportcommit.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-10 05:09:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-10 05:09:43 (GMT)
commit23ea3e201cea0deea909569e08e950a9ec2345f7 (patch)
tree614520079f232d1459467b6e718182a8721aadd5 /git-cvsexportcommit.perl
parent5ca15b8af7f018b9ae9da30130f9dcd1a896e0b3 (diff)
parenta1c292958f9968565f4048a17196d99fd16fc7ca (diff)
downloadgit-23ea3e201cea0deea909569e08e950a9ec2345f7.zip
git-23ea3e201cea0deea909569e08e950a9ec2345f7.tar.gz
git-23ea3e201cea0deea909569e08e950a9ec2345f7.tar.bz2
GIT 0.99.9gv0.99.9g
Another snapshot, as slow and steady marth towards 1.0 continues. Major changes include: - Jim Radford's RPM split. - Fredrik's recursive merge strategy is now default for two heads merge. - Yaacov's SVN importer updates. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-cvsexportcommit.perl')
-rwxr-xr-xgit-cvsexportcommit.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 7074b0c..50b041c 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -64,7 +64,7 @@ if ($parent) {
last;
}; # found it
die "Did not find $parent in the parents for this commit!";
-s }
+ }
} else { # we don't have a parent from the cmdline...
if (@parents == 1) { # it's safe to get it from the commit
$parent = $parents[0];