diff options
Diffstat (limited to 'scripts/git.clj')
| -rwxr-xr-x | scripts/git.clj | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/scripts/git.clj b/scripts/git.clj index c1e450b..a721b3a 100755 --- a/scripts/git.clj +++ b/scripts/git.clj @@ -41,7 +41,19 @@ (remove nil?) (str/join "/")))) -(defn git-current-rev [dir] (git dir "rev-parse" "--short" "HEAD")) +(defn git-current-rev [dir] + (let [commit (git dir "rev-parse" "--short" "HEAD")] + (when (not-empty (git dir "branch" "-r" "--contains" commit)) + commit))) + +#_ (todo add branch?) +#_ (defn git-current-branch [dir] ) + +(defn git-base-branch [dir] + (some->> (git dir "rev-parse" "--abbrev-ref" "origin/HEAD") :out + not-empty + (sh "basename") :out + not-empty)) (defn git-remote-url [dir file-path revision line-start line-end] (some-> (or (git-remote-origin dir) (git-first-remote dir)) @@ -54,7 +66,7 @@ (defn cmd-link [[file-path line-start line-end rev]] (let [dir (git-root file-path) - revision (or rev (git-current-rev dir) "main") + revision (or rev (git-current-rev dir) (git-base-branch dir) "main") relative-file-path (str/trim (:out (sh "realpath" "--relative-to" dir file-path))) remote-url (git-remote-url dir relative-file-path revision line-start line-end)] (println remote-url))) |