Skip to content

Commit

Permalink
changes separator from @ to / (#2986)
Browse files Browse the repository at this point in the history
* changes separator from @ to /
  • Loading branch information
eden-ohana authored Feb 28, 2022
1 parent 8c913d0 commit 2e2af31
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cmd/lakefs/cmd/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,18 @@ func runImport(cmd *cobra.Command, args []string) (statusCode int) {
}

if withMerge {
fmt.Printf("Merging import changes into lakefs://%s@%s/\n", repoName, repo.DefaultBranch)
fmt.Printf("Merging import changes into lakefs://%s/%s/\n", repoName, repo.DefaultBranch)
msg := fmt.Sprintf(onboard.CommitMsgTemplate, stats.CommitRef)
commitLog, err := c.Merge(ctx, repoName, onboard.DefaultImportBranchName, repo.DefaultBranch, CommitterName, msg, nil)
if err != nil {
fmt.Printf("Merge failed: %s\n", err)
return 1
}
fmt.Println("Merge was completed successfully.")
fmt.Printf("To list imported objects, run:\n\t$ lakectl fs ls lakefs://%s@%s/\n", repoName, commitLog)
fmt.Printf("To list imported objects, run:\n\t$ lakectl fs ls lakefs://%s/%s/\n", repoName, commitLog)
} else {
fmt.Printf("To list imported objects, run:\n\t$ lakectl fs ls lakefs://%s@%s/\n", repoName, stats.CommitRef)
fmt.Printf("To merge the changes to your main branch, run:\n\t$ lakectl merge lakefs://%s@%s lakefs://%s@%s\n", repoName, stats.CommitRef, repoName, repo.DefaultBranch)
fmt.Printf("To list imported objects, run:\n\t$ lakectl fs ls lakefs://%s/%s/\n", repoName, stats.CommitRef)
fmt.Printf("To merge the changes to your main branch, run:\n\t$ lakectl merge lakefs://%s/%s lakefs://%s/%s\n", repoName, stats.CommitRef, repoName, repo.DefaultBranch)
}

return 0
Expand Down

0 comments on commit 2e2af31

Please sign in to comment.