summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-30 05:55:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-30 05:55:07 (GMT)
commit30c0312fd182942c10421e77d2b3ec6284cc0468 (patch)
treee72fda2a27115091cdb6352ebfaf1302dd814a7c /git-cvsimport.perl
parent7b7f39eae6ab0bbcc68d3c42a5b23595880e528f (diff)
parentb3bb5f76e6193db102b063187be854ef3842d89b (diff)
downloadgit-30c0312fd182942c10421e77d2b3ec6284cc0468.zip
git-30c0312fd182942c10421e77d2b3ec6284cc0468.tar.gz
git-30c0312fd182942c10421e77d2b3ec6284cc0468.tar.bz2
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: cvsimport: always pass user data to "system" as a list fix reflog approxidate parsing bug
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 95c5eec..bdac5d5 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -772,7 +772,7 @@ sub commit {
waitpid($pid,0);
die "Error running git-commit-tree: $?\n" if $?;
- system("git-update-ref $remote/$branch $cid") == 0
+ system('git-update-ref', "$remote/$branch", $cid) == 0
or die "Cannot write branch $branch for update: $!\n";
if ($tag) {