[ARVADOS] updated: b7b42350dec7aba073df13c9cd82bafe19a9f594

[Git user]

Summary of changes:
 services/api/app/models/commit.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  b7b42350dec7aba073df13c9cd82bafe19a9f594 (commit)
       via  ae931becad1e90bcecd47c6d51dc04eee632d1f5 (commit)
      from  b1b8942ee0190343dd815b895f49d3894d7f2702 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b7b42350dec7aba073df13c9cd82bafe19a9f594
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Sep 19 09:56:29 2017 -0400

    12107: Fix broken commit-exists-in-internal-repo check.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/models/commit.rb b/services/api/app/models/commit.rb
index 32125a2..959a9f2 100644
--- a/services/api/app/models/commit.rb
+++ b/services/api/app/models/commit.rb
@@ -149,7 +149,7 @@ class Commit < ActiveRecord::Base
     dst_gitdir = Rails.configuration.git_internal_dir
 
     begin
-      commit_in_dst = must_git(dst_gitdir, "rev-parse --verify #{sha1.shellescape}^{commit}").strip
+      commit_in_dst = must_git(dst_gitdir, "log -n1 --format=%H #{sha1.shellescape}^{commit}").strip
     rescue GitError
       commit_in_dst = false
     end

commit ae931becad1e90bcecd47c6d51dc04eee632d1f5
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Sep 19 09:52:02 2017 -0400

    12107: Fix broken "git branch --contains" check.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/models/commit.rb b/services/api/app/models/commit.rb
index aa38462..32125a2 100644
--- a/services/api/app/models/commit.rb
+++ b/services/api/app/models/commit.rb
@@ -164,7 +164,8 @@ class Commit < ActiveRecord::Base
       # is no such branch, or the branch we choose changes under us in
       # race), we fall back to pack|unpack.
       begin
-        branches = must_git("branch --contains #{sha1.shellescape}^{commit}")
+        branches = must_git(src_gitdir,
+                            "branch --contains #{sha1.shellescape}")
         m = branches.match(/^. (\w+)\n/)
         if !m
           raise GitError.new "commit is not on any branch"

-----------------------------------------------------------------------


hooks/post-receive
--