autobuild 1.4.6 → 1.4.7

data/Changes.txt

@@ -1,3 +1,6 @@
+== Version 1.4.7
+* have the git importer update the autobuild remote on update.
+
 == Version 1.4.6
 * add missing importer/archive.rb file
 

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.4.6" unless defined? Autobuild::VERSION
+    VERSION = "1.4.7" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/import/git.rb

@@ -84,18 +84,36 @@ module Autobuild
         def fetch_remote(package)
             validate_srcdir(package)
             Dir.chdir(package.srcdir) do
-                if commit # we are checking out a specific commit. We just call git fetch
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository)
+                # Update the remote definition
+                Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                               "--replace-all", "remote.autobuild.url", repository)
+                Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                               "--replace-all", "remote.autobuild.fetch",  "+refs/heads/*:refs/remotes/autobuild/*")
+
+                # We are checking out a specific commit. We just call git fetch
+                if commit 
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', 'autobuild')
                 else
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository, branch || tag)
                 end
-                if File.readable?( File.join('.git', 'FETCH_HEAD') )
+
+                # Now get the actual commit ID from the FETCH_HEAD file, and
+                # return it
+                commit_id = if File.readable?( File.join('.git', 'FETCH_HEAD') )
                     fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
                         delete_if { |l| l =~ /not-for-merge/ }
                     if !fetch_commit.empty?
                         fetch_commit.first.split(/\s+/).first
                     end
                 end
+
+                # Update the remote tag if needs be
+                if branch && commit_id
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'update-ref',
+                                   "-m", "updated by autobuild", "refs/remotes/autobuild/#{branch}", commit_id)
+                end
+
+                commit_id
             end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 +01:00
+date: 2010-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   This work is licensed under the GPLv2 license. See License.txt for details