Merge pull request #243 from matthewrmshin/fix-bad-switch-warning

fcm switch: fix Perl warning
metomi · Feb 22, 2017 · 7a454e7 · 7a454e7
2 parents 14f4037 + 6712ff4
commit 7a454e7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/FCM1/Cm.pm b/lib/FCM1/Cm.pm
@@ -1794,7 +1794,9 @@ sub _cm_get_source {
         return _cm_err(FCM1::Cm::Exception->INVALID_BRANCH, $source_url);
     }
     $source->url_peg(
-      $source->branch_url() . '/' . $target->subdir() . '@' . $source->pegrev()
+        $source->branch_url()
+        . ($target->subdir() ? '/' . $target->subdir() : q{})
+        . ('@' . $source->pegrev())
     );
     # Ensure that the source and target URLs are in the same project
     if ($source->project_url() ne $target->project_url()) {