Fix Git::Branch#update_ref (#626)

jcouball · mblythe86 · web-flow · commit 4409ef282628 · 2023-02-26T10:17:13.000-08:00
* Branch-related bugfixes Fixes both #599 and #600 Also fixes argument name of update_ref. I'm assuming it's supposed to be analogous to the command line `git update-ref`, which doesn't directly use a branch name. Signed-off-by: Matthew Blythe <mblythester+git@gmail.com> * Add test for Branch#update_ref Signed-off-by: James Couball <jcouball@yahoo.com> --------- Signed-off-by: Matthew Blythe <mblythester+git@gmail.com> Signed-off-by: James Couball <jcouball@yahoo.com> Co-authored-by: Matthew Blythe <mblythester+git@gmail.com>
diff --git a/lib/git/branch.rb b/lib/git/branch.rb
@@ -78,7 +78,11 @@ def merge(branch = nil, message = nil)
     end
     
     def update_ref(commit)
-      @base.lib.update_ref(@full, commit)
+      if @remote
+        @base.lib.update_ref("refs/remotes/#{@remote.name}/#{@name}", commit)
+      else
+        @base.lib.update_ref("refs/heads/#{@name}", commit)
+      end
     end
     
     def to_a
@@ -114,7 +118,7 @@ def determine_current
       # param [String] name branch full name.
       # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names. 
       def parse_name(name)
-        if name.match(/^(?:remotes)?\/([^\/]+)\/(.+)/)
+        if name.match(/^(?:remotes\/)?([^\/]+)\/(.+)/)
           return [Git::Remote.new(@base, $1), $2]
         end
 
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -974,8 +974,8 @@ def commit_tree(tree, opts = {})
       command('commit-tree', *arr_opts, redirect: "< #{escape t.path}")
     end
 
-    def update_ref(branch, commit)
-      command('update-ref', branch, commit)
+    def update_ref(ref, commit)
+      command('update-ref', ref, commit)
     end
 
     def checkout_index(opts = {})
diff --git a/tests/units/test_branch.rb b/tests/units/test_branch.rb
@@ -98,4 +98,22 @@ def test_branch_create_and_switch
       assert(git.branch('other_branch').current)
     end
   end
+
+  def test_branch_update_ref
+    in_temp_dir do |path|
+      git = Git.init
+      File.write('foo','rev 1')
+      git.add('foo')
+      git.commit('rev 1')
+      git.branch('testing').create
+      File.write('foo','rev 2')
+      git.add('foo')
+      git.commit('rev 2')
+      git.branch('testing').update_ref(git.revparse('HEAD'))
+
+      # Expect the call to Branch#update_ref to pass the full ref name for the
+      # of the testing branch to Lib#update_ref
+      assert_equal(git.revparse('HEAD'), git.revparse('refs/heads/testing'))
+    end
+  end
 end
