git-whence 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8469e43011173ed18cdd8b1d51709b6436286037806fb88e923901ff2c6a7123
-  data.tar.gz: c5e5821f09e4019e5aa23c66a2b4c76160c5219e69cb3fb506119348caaaaf48
+  metadata.gz: d905ac8083db64392216de76354c9f4fdf082ec37654e6d17a5355c2d616091e
+  data.tar.gz: 80bcec14ef080aecc1b8ad0db28ba44d9eb273ce890cbd75e7bc76d21fac17f9
 SHA512:
-  metadata.gz: 3b184b3804d3f0adc3c8c909dc62bd5a77d3d9565b25dd65bb397f3333ab4fec834e767caa0e3389c5c500a9f9bd7fe4872808d25db1efe833ae4ee06b0e5cd5
-  data.tar.gz: 73e1238e7a961cdad0e4558d5d2fd8579d5e54f0dc2c2b044b5d1db4b3e3a73493e7bfbd3afa27013b6ba3f77a0453fff1bf02b6c706a5629783c5a801940e73
+  metadata.gz: 0d3626ddbb2c37530b32f152809ac02675f816df2457e1c339af15da06a0c87a75a1d67b7f2ca6820769eb55c286cee7385881ae92182b06772fe1f0aba8325e
+  data.tar.gz: a35ab59affb9244aed513371ad3ebdc2b0c9b29c060dd945b1d801a7578b18d19f8d4d0c89957e670587f60a6118d2074ad62d374097fd5c87cc5818226d03ee

data/lib/git/whence/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Whence
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/git/whence.rb

@@ -4,6 +4,7 @@ require "optparse"
 module Git::Whence
   module CLI
     SQUASH_REGEX = /\(#(\d+)\)$/
+    DEFAULT_BRANCHES = ["main", "master"]
 
     class << self
       def run(argv)
@@ -66,8 +67,8 @@ module Git::Whence
       def find_merge(commit)
         merge_commit, merge = (
           find_merge_simple(commit, "HEAD") ||
-          find_merge_simple(commit, "master") ||
-          find_merge_fuzzy(commit, "master")
+          find_merge_simple(commit, default_branch) ||
+          find_merge_fuzzy(commit, default_branch)
         )
 
         if merge && merge_include_commit?(merge, merge_commit)
@@ -83,11 +84,29 @@ module Git::Whence
       end
 
       def find_merge_fuzzy(commit, branch)
-        if similar = find_similar(commit, branch)
+        if (similar = find_similar(commit, branch))
           find_merge_simple(similar, branch)
         end
       end
 
+      def default_branch
+        @default_branch ||= remote_default_branch || local_default_branch
+      end
+
+      def remote_default_branch
+        remotes = sh("git remote").split("\n")
+        return nil if remotes.empty?
+        preferred = (remotes.include?("origin") ? "origin" : remotes.first)
+        folder = ".git/refs/remotes/#{preferred}"
+        (Dir["#{folder}/*"].map { |f| f.sub("#{folder}/", "") } & DEFAULT_BRANCHES).sort.first
+      end
+
+      # guess default branch by last changed commonly used default branch or current branch
+      def local_default_branch
+        branches = sh("git branch --sort=-committerdate").split("\n").map { |br| br.split(" ").last }
+        (branches & DEFAULT_BRANCHES).first || sh("git symbolic-ref HEAD").strip.sub("refs/heads/", "")
+      end
+
       def find_squash_merge(commit)
         commit if sh("git show -s --format='%s' #{commit}") =~ SQUASH_REGEX
       end
@@ -98,7 +117,7 @@ module Git::Whence
         time = time.to_i
         same = sh("git log #{branch} --pretty=format:'%H %an %s' --before #{time + month} --after #{time - month}")
         found = same.split("\n").map { |x| x.split(" ", 2) }.detect { |_, message| message == search }
-        found && found.first
+        found&.first
       end
 
       def find_merge_simple(commit, branch)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: git-whence
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: michael@grosser.it
 executables:
 - git-whence
@@ -25,7 +25,7 @@ homepage: https://github.com/grosser/git-whence
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -33,15 +33,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Find the merge and pull request a commit came from + find cherry-picks
 test_files: []