Generator: fix git getting branches

Author: ilevd

src/wiki/generator/git.clj

@@ -60,9 +60,11 @@
         tag-lines (split (run-git git-ssh path "for-each-ref" "--format='%(refname:short)|-|%(objectname)|-|%(authorname)|-|%(contents:subject)'" "refs/tags") #"\n")
         lines (map (fn [line]
                      (-> line
-                         (string/replace #"^(')(.*)(')$" "$2") ;; delete start and end quotes ' ;; delete ?origin/"
-                         (string/replace #"^([^/]*)/(.*)$" "$2")))
+                         (string/replace #"^(')(.*)(')$" "$2") ;; delete start and end quotes '
+                         ;; delete ?origin/"
+                         (string/replace #"^(origin|tags)/" "")))
                    (sort (distinct (concat branch-lines tag-lines))))
+        _ (prn :lines lines)
         filtered-lines (filter (fn [s] (and (some? s)
                                             (seq s)
                                             (not (string/starts-with? s "HEAD")))) lines)

src/wiki/web/handlers/links_handlers.clj

@@ -14,8 +14,8 @@
 (defn links [request]
   (let [version (-> request :params :version)
         version (if (or (= version "latest")
-                          (= version "Release Candidate")
-                          (= version "rc"))
+                        (= version "Release Candidate")
+                        (= version "rc"))
                   (versions-data/default (jdbc request))
                   version)