Safer line sub for git-annex command

b37c4d67 · Dmitriy Zaporozhets · 8ab4228b · b37c4d67 · b37c4d67 · b37c4d67
Commit b37c4d67 authored Feb 18, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

CHANGELOG CHANGELOG +3 -0

VERSION VERSION +1 -1

lib/gitlab_shell.rb lib/gitlab_shell.rb +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+v2.5.2
+  - Safer line sub for git-annex command
+
 v2.5.1
  - Expect broadcast message to return empty JSON if no message now


--- a/VERSION
+++ b/VERSION
-2.5.1
+2.5.2
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -51,7 +51,7 @@ class GitlabShell
    @git_cmd = args.first

    if @git_cmd == 'git-annex-shell' && @config.git_annex_enabled?
-      @repo_name = escape_path(args[2].gsub("\/~\/", ''))
+      @repo_name = escape_path(args[2].sub(/\A\/~\//, ''))

      # Make sure repository has git-annex enabled
      init_git_annex(@repo_name)